diff --git a/Dockerfile b/Dockerfile index 40df375..c548882 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,6 +38,8 @@ RUN mkdir -p public/build/ && npm i && npm run build # RUN FROM php:8.2-alpine AS final +ARG APP_ENV_FILE=.env.docker + # Install system dependencies RUN apk update && apk add --no-cache \ git \ @@ -63,7 +65,7 @@ WORKDIR /var/www COPY . . COPY --from=build-vue /usr/app/public/build ./public/build -RUN mv .env.docker .env +RUN mv ${APP_ENV_FILE} .env # DUSK # RUN php artisan dusk:install && php artisan dusk:chrome-driver && mv ./undetectedChromedriver/chromedriver-linux ./vendor/laravel/dusk/bin/chromedriver-linux diff --git a/app/Browser/BrowserJob.php b/app/Browser/BrowserJob.php index 06334a5..6ecdc1c 100644 --- a/app/Browser/BrowserJob.php +++ b/app/Browser/BrowserJob.php @@ -217,6 +217,10 @@ abstract class BrowserJob implements ShouldQueue $this->execute(); } + public function reschedule($minutes) { + $this::dispatch()->delay(now()->addMinutes($minutes)); + } + // === BROWSER MACROS === protected function waitForAndClickText(Browser $browser, string $text, int $timeout = 30, bool $ignoreCase = true) { diff --git a/app/Browser/Jobs/Hellcase/HellcaseJob.php b/app/Browser/Jobs/Hellcase/HellcaseJob.php index 7c541df..352d1b9 100644 --- a/app/Browser/Jobs/Hellcase/HellcaseJob.php +++ b/app/Browser/Jobs/Hellcase/HellcaseJob.php @@ -177,13 +177,14 @@ class HellcaseJob extends BrowserJob $hours = explode(" ", $hours); $minutes = $hours[4]; $hours = $hours[2]; - // $this->reschedule($hours); $this->jobRun->addArtifact(new JobArtifact([ "name" => "Cadeau gratuit pas encore disponible", - "content" => "Le cadeau gratuit journalier sera disponible dans {$hours} heures et {$minutes} minutes.\nDatboi se fera un plaisir d'aller le chercher pour vous." + "content" => "Le cadeau gratuit journalier sera disponible dans {$hours} heures et {$minutes} minutes." ])); + $this->reschedule($hours * 60 + $minutes + 1); + return; } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 9bbe096..f67b47c 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -24,6 +24,9 @@ class AppServiceProvider extends ServiceProvider { Vite::prefetch(concurrency: 3); + dd(env('APP_URL')); + dd(config('app.url')); + dd($_ENV['APP_URL']); if (str_starts_with(env('APP_URL'), "https://")) { $url->forceScheme('https'); }