s6-overlay improvements (alexjustesen#452)

Author: alexjustesen

Dockerfile

@@ -6,21 +6,20 @@ ENV PHP_OPEN_BASEDIR=$WEBUSER_HOME:/config/:/dev/stdout:/tmp
 # Enable mixed ssl mode so port 80 or 443 can be used
 ENV SSL_MODE="mixed"
 
-# Install addition packages
-RUN apt-get update && apt-get install -y \
-    cron \
-    gnupg \
-    php8.1-gd \
-    php8.1-pgsql \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+# 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 \
+    && echo "MAILTO=\"\"\n* * * * * webuser /usr/bin/php /var/www/html/artisan schedule:run" > /etc/cron.d/laravel
 
 # Install Speedtest cli
 RUN curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | bash \
     && apt-get install -y speedtest
 
+# Clean up package lists
+RUN apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+
 # Copy package configs
-COPY --chmod=644 docker/deploy/cron/scheduler /etc/cron.d/scheduler
 COPY --chmod=755 docker/deploy/etc/s6-overlay/ /etc/s6-overlay/
 
 WORKDIR /var/www/html
@@ -32,7 +31,6 @@ COPY --chown=webuser:webgroup . /var/www/html
 RUN composer install --no-interaction --prefer-dist --optimize-autoloader --no-dev \
     && mkdir -p storage/logs \
     && php artisan optimize:clear \
-    && chown -R webuser:webgroup /var/www/html \
-    && crontab /etc/cron.d/scheduler
+    && chown -R webuser:webgroup /var/www/html
 
 VOLUME /config

docker-compose.yml

@@ -24,6 +24,7 @@ services:
         depends_on:
             - mysql
             - mailpit
+            - pgsql
     mysql:
         image: 'mysql/mysql-server:8.0'
         ports:
@@ -55,9 +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
 networks:
     sail:
         driver: bridge
 volumes:
     sail-mysql:
         driver: local
+    sail-pgsql:
+        driver: local

docker/deploy/cron/scheduler

@@ -1,3 +1,2 @@
 #!/command/with-contenv bash
-echo "⏰  Starting the cron service..."
 s6-setuidgid root /usr/sbin/cron -f -l 8

docker/deploy/etc/s6-overlay/s6-rc.d/cron/dependencies

@@ -0,0 +1,2 @@
+runas-user
+configure-ssl

…-overlay/s6-rc.d/user/contents.d/startup …/cron/dependencies.d/laravel-automationsdocker/deploy/etc/s6-overlay/s6-rc.d/user/contents.d/startup renamed to docker/deploy/etc/s6-overlay/s6-rc.d/cron/dependencies.d/laravel-automations docker/deploy/etc/s6-overlay/s6-rc.d/user/contents.d/startup renamed to docker/deploy/etc/s6-overlay/s6-rc.d/cron/dependencies.d/laravel-automations

@@ -1,3 +1,2 @@
 #!/command/with-contenv bash
-echo "💪  Starting the queue worker..."
 s6-setuidgid webuser php $WEBUSER_HOME/artisan queue:work --tries=3 --no-ansi -q