Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions config/filament.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -183,7 +182,7 @@

'database_notifications' => [
'enabled' => true,
'polling_interval' => '5s',
'polling_interval' => env('NOTIFICATION_POLLING', '60s'),
],

/*
Expand Down
4 changes: 2 additions & 2 deletions config/speedtest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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),
];
56 changes: 28 additions & 28 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
depends_on:
- mysql
- mailpit
- pgsql
# - pgsql
mysql:
image: 'mysql/mysql-server:8.0'
ports:
Expand Down Expand Up @@ -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