diff --git a/Dockerfile b/Dockerfile index eee46c2be..0efb98e81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,10 @@ ENV SSL_MODE="mixed" # Install addition packages and cron file RUN apt-get update \ - && apt-get install -y --no-install-recommends cron gnupg php8.1-gd php8.1-pgsql \ + && apt-get install -y --no-install-recommends \ + cron \ + htop \ + php8.1-pgsql \ && echo "MAILTO=\"\"\n* * * * * webuser /usr/bin/php /var/www/html/artisan schedule:run" > /etc/cron.d/laravel \ \ # Install Speedtest cli diff --git a/config/filament.php b/config/filament.php index 43c0f25d1..26af0f258 100644 --- a/config/filament.php +++ b/config/filament.php @@ -3,7 +3,6 @@ use Filament\Http\Middleware\Authenticate; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Http\Middleware\MirrorConfigToSubpackages; -use Filament\Pages; use Filament\Widgets; use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; @@ -183,7 +182,7 @@ 'database_notifications' => [ 'enabled' => true, - 'polling_interval' => '5s', + 'polling_interval' => env('NOTIFICATION_POLLING', '60s'), ], /* diff --git a/config/speedtest.php b/config/speedtest.php index 7e0807bb4..857a00d22 100644 --- a/config/speedtest.php +++ b/config/speedtest.php @@ -13,7 +13,7 @@ /** * Polling */ - 'dashboard_polling' => env('DASHBOARD_POLLING', '5s'), + 'dashboard_polling' => env('DASHBOARD_POLLING', '60s'), - 'results_polling' => env('RESULTS_POLLING', '5s'), + 'results_polling' => env('RESULTS_POLLING', null), ]; diff --git a/docker-compose.yml b/docker-compose.yml index 6b66d83a7..76a00ca5b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: depends_on: - mysql - mailpit - - pgsql + # - pgsql mysql: image: 'mysql/mysql-server:8.0' ports: @@ -56,36 +56,36 @@ services: - '${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025' networks: - sail - pgsql: - image: 'postgres:15' - ports: - - '${FORWARD_DB_PORT:-5432}:5432' - environment: - PGPASSWORD: '${DB_PASSWORD:-secret}' - POSTGRES_DB: '${DB_DATABASE}' - POSTGRES_USER: '${DB_USERNAME}' - POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}' - volumes: - - 'sail-pgsql:/var/lib/postgresql/data' - - './vendor/laravel/sail/database/pgsql/create-testing-database.sql:/docker-entrypoint-initdb.d/10-create-testing-database.sql' - networks: - - sail - healthcheck: - test: - - CMD - - pg_isready - - '-q' - - '-d' - - '${DB_DATABASE}' - - '-U' - - '${DB_USERNAME}' - retries: 3 - timeout: 5s + # pgsql: + # image: 'postgres:15' + # ports: + # - '${FORWARD_DB_PORT:-5432}:5432' + # environment: + # PGPASSWORD: '${DB_PASSWORD:-secret}' + # POSTGRES_DB: '${DB_DATABASE}' + # POSTGRES_USER: '${DB_USERNAME}' + # POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}' + # volumes: + # - 'sail-pgsql:/var/lib/postgresql/data' + # - './vendor/laravel/sail/database/pgsql/create-testing-database.sql:/docker-entrypoint-initdb.d/10-create-testing-database.sql' + # networks: + # - sail + # healthcheck: + # test: + # - CMD + # - pg_isready + # - '-q' + # - '-d' + # - '${DB_DATABASE}' + # - '-U' + # - '${DB_USERNAME}' + # retries: 3 + # timeout: 5s networks: sail: driver: bridge volumes: sail-mysql: driver: local - sail-pgsql: - driver: local + # sail-pgsql: + # driver: local