feat: added redis as cache

Author: Tbaile

.env.example

@@ -12,6 +12,9 @@ LOG_DEPRECATIONS_CHANNEL=errorlog
 
 DB_CONNECTION=sqlite
 
+SESSION_DRIVER=redis
+CACHE_STORE=redis
+
 FILESYSTEM_DISK=local
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=

composer.json

@@ -23,6 +23,7 @@
         "ext-pcntl": "*",
         "ext-pcre": "*",
         "ext-pdo": "*",
+        "ext-redis": "*",
         "ext-session": "*",
         "ext-tokenizer": "*",
         "ext-xml": "*",

composer.lock

@@ -1,4 +1,4 @@
-ARG PHP_EXTENSIONS="pcntl"
+ARG PHP_EXTENSIONS="pcntl redis"
 ARG ADDITIONAL_PACKAGES="bash rclone sqlite"
 
 FROM php:8.4.11-fpm-alpine AS base
@@ -10,14 +10,13 @@ ADD --chmod=777 \
     --checksum=sha256:206a8f9b2177703fc5aa924d85ad6c72e82413e2d09635b4c9c82a1b65b5b3d5 \
     https://github.com/eficode/wait-for/releases/download/v2.2.4/wait-for /usr/local/bin/wait-for
 # configure entrypoints and image
-RUN echo "* * * * * cd /var/www/html && php artisan schedule:run" > /etc/crontabs/www-data
-COPY --chmod=777 containers/php/entrypoint.sh /usr/local/sbin/entrypoint
-ENTRYPOINT ["entrypoint"]
-CMD ["php-fpm"]
 ARG PHP_EXTENSIONS
 ARG ADDITIONAL_PACKAGES
 RUN apk add --no-cache ${ADDITIONAL_PACKAGES} \
     && install-php-extensions ${PHP_EXTENSIONS}
+COPY --chmod=777 containers/php/entrypoint.sh /usr/local/sbin/entrypoint
+ENTRYPOINT ["entrypoint"]
+CMD ["php-fpm"]
 
 
 FROM base AS development

containers/php/Dockerfile

@@ -2,38 +2,38 @@
 
 set -e
 
-if [ -f '.env' ]; then
-    . .env
-fi
+wait_for_services() {
+    wait-for "${PHP_HOST:?Missing PHP_HOST}:${PHP_PORT:?Missing PHP_PORT}" -t 60
+}
 
-if [ "$1" = "php-fpm" ]; then
+optimize() {
     if [ "$APP_ENV" != "local" ]; then
         php artisan optimize
-    else
+    fi
+}
+
+if [ "$1" = "php-fpm" ]; then
+    optimize
+    if [ "$APP_ENV" = "local" ]; then
         composer install
     fi
     php artisan migrate --force
     if [ "$(id -u)" = '0' ]; then
         chown -R www-data:www-data storage
     fi
+    exec "$@"
 elif [ "$1" = "scheduler" ]; then
-    wait-for "${PHP_HOST:?Missing PHP_HOST}:${PHP_PORT:?Missing PHP_PORT}" -t 60
-    if [ "$APP_ENV" != "local" ]; then
-        php artisan optimize
-    fi
-    set -- crond -f -d 8
+    wait_for_services
+    optimize
+    exec su -s /bin/sh -c "php artisan schedule:work --quiet" www-data
 elif [ "$1" = "worker" ]; then
-    wait-for "${PHP_HOST:?Missing PHP_HOST}:${PHP_PORT:?Missing PHP_PORT}" -t 60
-    if [ "$APP_ENV" != "local" ]; then
-        php artisan optimize
-    fi
-    set -- su -s /bin/sh -c "php artisan queue:work --tries=3 --timeout=1800" www-data
+    wait_for_services
+    optimize
+    exec su -s /bin/sh -c "php artisan queue:work --tries=3 --timeout=1800" www-data
 elif [ "$1" = "nightwatch" ]; then
-    wait-for "${PHP_HOST:?Missing PHP_HOST}:${PHP_PORT:?Missing PHP_PORT}" -t 60
-    if [ "$APP_ENV" != "local" ]; then
-        php artisan optimize
-    fi
-    set -- su -s /bin/sh -c "php artisan nightwatch:agent --listen-on 0.0.0.0:2407" www-data
+    wait_for_services
+    optimize
+    exec su -s /bin/sh -c "php artisan nightwatch:agent --listen-on 0.0.0.0:2407" www-data
+else
+    exec "$@"
 fi
-
-exec "$@"

containers/php/entrypoint.sh

@@ -12,6 +12,8 @@ x-app: &app
   volumes:
     - /etc/localtime:/etc/localtime:ro
     - .:/var/www/html
+  env_file:
+    - .env
 
 services:
   nginx:
@@ -32,6 +34,7 @@ services:
     <<: *app
     user: root
     command: scheduler
+    stop_signal: SIGKILL
     environment:
       PHP_HOST: php
       PHP_PORT: 9000
@@ -46,6 +49,7 @@ services:
     <<: *app
     user: root
     command: nightwatch
+    stop_signal: SIGKILL
     environment:
       PHP_HOST: php
       PHP_PORT: 9000
@@ -55,3 +59,8 @@ services:
       timeout: 5s
       retries: 3
       start_period: 5s
+  redis:
+    image: redis:8.2.1-alpine
+    restart: unless-stopped
+    ports:
+      - "6379:6379"