fix: uses new base image for app

.env

@@ -36,3 +36,8 @@ MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
 # MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
 MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 ###< symfony/messenger ###
+
+REDIS_HOST=redis://redis
+
+MOVIES_PATH=/var/download/movies
+TVSHOWS_PATH=/var/download/tvshows

bash/caddy/Caddyfile

@@ -2,5 +2,5 @@ dev.caldwell.digital:443
 
 tls /etc/ssl/wildcard.crt /etc/ssl/wildcard.pem
 
-reverse_proxy web:80
+reverse_proxy app:80
 

bash/entrypoint.sh

@@ -10,9 +10,4 @@ sleep $SLEEP_TIME
 php /var/www/bin/console doctrine:migrations:migrate --no-interaction
 php /var/www/bin/console db:seed
 
-# Start Apache in the foreground
-echo "Starting PHP-FPM..."
-php-fpm
-
-exec "$@"
-
+/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf

bash/nginx.conf

@@ -5,7 +5,6 @@ server {
 
     root /var/www/public;
 
-
     location /hub/ {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header Host $host;
@@ -14,53 +13,20 @@ server {
         proxy_pass http://mercure/;
     }
 
+
     location / {
         # try to serve file directly, fallback to index.php
         try_files $uri /index.php$is_args$args;
     }
 
-    # optionally disable falling back to PHP script for the asset directories;
-    # nginx will return a 404 error when files are not found instead of passing the
-    # request to Symfony (improves performance but Symfony's 404 page is not displayed)
-    # location /bundles {
-    #     try_files $uri =404;
-    # }
-
-    location ~ ^/index\.php(/|$) {
-        fastcgi_pass app:9000;
-
+    location ~ \.php$ {
+        fastcgi_pass unix:/run/php-fpm.sock;
         fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        fastcgi_buffers 16 16k;
+        fastcgi_buffer_size 32k;
         include fastcgi_params;
-
-        # optionally set the value of the environment variables used in the application
-        # fastcgi_param APP_ENV prod;
-        # fastcgi_param APP_SECRET <app-secret-id>;
-        # fastcgi_param DATABASE_URL "mysql://db_user:db_pass@host:3306/db_name";
-
-        # When you are using symlinks to link the document root to the
-        # current version of your application, you should pass the real
-        # application path instead of the path to the symlink to PHP
-        # FPM.
-        # Otherwise, PHP's OPcache may not properly detect changes to
-        # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
-        # for more information).
-        # Caveat: When PHP-FPM is hosted on a different machine from nginx
-        #         $realpath_root may not resolve as you expect! In this case try using
-        #         $document_root instead.
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param DOCUMENT_ROOT $document_root;
-        # Prevents URIs that include the front controller. This will 404:
-        # http://example.com/index.php/some-path
-        # Remove the internal directive to allow URIs like this
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
         internal;
     }
-
-    # return 404 for all other php files not matching the front controller
-    # this prevents access to other php files you don't want to be accessible.
-    location ~ \.php$ {
-        return 404;
-    }
-
-    error_log /var/log/nginx/project_error.log;
-    access_log /var/log/nginx/project_access.log;
 }

compose.yml

@@ -12,16 +12,6 @@ services:
       - $PWD/bash/caddy:/etc/caddy
       - $PWD/bash/certs:/etc/ssl
 
-  web:
-    image: code.caldwell.digital/home/torsearch/web:latest
-    ports:
-      - '8080:80'
-    volumes:
-      - $PWD/bash/nginx.conf:/etc/nginx/conf.d/default.conf
-    depends_on:
-      app:
-        condition: service_healthy
-
   redis:
     image: redis:latest
     volumes:
@@ -30,29 +20,41 @@ services:
     restart: unless-stopped
 
   app:
-    build: .
+    build:
+      dockerfile: docker/Dockerfile.app
+      context: .
+    ports:
+      - "8001:80"
     volumes:
       - ./:/var/www
+      - ./bash/nginx.conf:/etc/nginx/conf.d/site.conf
     depends_on:
       database:
         condition: service_healthy
 
   worker:
-    image: code.caldwell.digital/home/torsearch:0.14.5-worker
+    build:
+      dockerfile: docker/Dockerfile.worker
+      context: .
     volumes:
-      - ./:/var/www
-      - ./var/download:/var/download
-    command: php ./bin/console messenger:consume async -vvv --time-limit=3600
+      - ./:/app
+      - ./var/downloads/movies:/var/download/movies
+      - ./var/downloads/tvshows:/var/download/tvshows
+    command: -v --time-limit=3600 --limit=10
+    env_file:
+      - .env
     depends_on:
       app:
         condition: service_healthy
 
   scheduler:
-    image: code.caldwell.digital/home/torsearch:0.14.5-worker
+    build:
+      dockerfile: docker/Dockerfile.scheduler
+      context: .
     volumes:
       - ./:/var/www
       - ./var/download:/var/download
-    command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
+    command: -vv --time-limit=3600
     depends_on:
       app:
         condition: service_healthy

config/services.yaml

@@ -7,7 +7,7 @@ parameters:
     # Media
     media.default_movies_dir: movies
     media.default_tvshows_dir: tvshows
-    media.movies_path: '/var/download/%env(default:media.default_movies_dir:MOVIES_PATH)%'
+    media.movies_path: '%env(default:media.default_movies_dir:MOVIES_PATH)%'
     media.tvshows_path: '/var/download/%env(default:media.default_tvshows_dir:TVSHOWS_PATH)%'
 
     # Mercure

deploy.compose.yml

@@ -10,12 +10,12 @@ services:
         condition: service_healthy
 
   app:
-    image: registry.caldwell.digital/home/torsearch/app:${TAG}
+    image: code.caldwell.digital/home/torsearch/app:${TAG}
     deploy:
       replicas: 2
 
   worker:
-    image: registry.caldwell.digital/home/torsearch/app:${TAG}
+    image: code.caldwell.digital/home/torsearch/app:${TAG}
     volumes:
       - /mnt/media/downloads:/var/download
     command: php ./bin/console messenger:consume async -v --time-limit=3600 --limit=10
@@ -23,7 +23,7 @@ services:
       replicas: 2
 
   scheduler:
-    image: registry.caldwell.digital/home/torsearch/app:${TAG}
+    image: code.caldwell.digital/home/torsearch/app:${TAG}
     volumes:
       - /mnt/media/downloads:/var/download
     command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600

docker/Dockerfile.app

@@ -1,16 +1,14 @@
-FROM php:8.4-fpm-alpine3.21
+FROM trafex/php-nginx:3.9.0
 
-RUN docker-php-ext-install pdo_mysql
+USER root
 
-# SETUP PHP-FPM CONFIG SETTINGS (max_children / max_requests)
-RUN echo 'pm = dynamic' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
-    echo 'pm.max_children = 75' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
-    echo 'pm.start_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
-    echo 'pm.min_spare_servers = 5' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
-    echo 'pm.max_spare_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
-    echo 'pm.process_idle_timeout = 10s' >> /usr/local/etc/php-fpm.d/zz-docker.conf
+RUN apk add --no-cache \
+      php84-pdo_mysql \
+      php84-simplexml
 
-COPY --chown=www-data:www-data . /var/www
+USER nobody
+
+COPY --chown=nobody:nobody . /var/www
 COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
 
 HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]

docker/Dockerfile.scheduler

@@ -0,0 +1,7 @@
+FROM php:8.4-cli-alpine3.21
+
+RUN docker-php-ext-install pdo_mysql
+
+COPY --chown=www-data:www-data . /app
+
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume",  "scheduler_monitor" ]

docker/Dockerfile.worker

@@ -1,12 +1,7 @@
-FROM registry.caldwell.digital/library/php:8.4-apache
+FROM php:8.4-cli-alpine3.21
 
-RUN apt-get update && \
-    apt-get install libldap2-dev -y && \
-    rm -rf /var/lib/apt/lists/* && \
-    docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
-    docker-php-ext-install ldap
+RUN docker-php-ext-install pdo_mysql
 
-COPY --chown=www-data:www-data . /var/www
+COPY --chown=www-data:www-data . /app
 
-COPY ./bash/vhost.conf /etc/apache2/sites-enabled/vhost.conf
-RUN rm /etc/apache2/sites-enabled/000-default.conf
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume",  "async" ]

docs/examples/.env

@@ -5,6 +5,7 @@
 # used to generate the Mercure URL behind the scenes.
 APP_URL="https://torsearch.idocode.io"
 APP_SECRET="70169beadfbc8101c393cbfbba27a313"
+APP_ENV=prod
 
 # Use the DATABASE_URL below to use the MariaDB container
 # provided in the example.compose.yml file, or remove this

docs/examples/compose.yml

@@ -3,18 +3,12 @@ services:
   # proxies traffic back to their respective services. If not
   # running behind a reverse proxy inject your SSL certificates
   # into this container.
-  web:
-    image: code.caldwell.digital/home/torsearch-web:latest
-    ports:
-      - '8006:80'
-    depends_on:
-      app:
-        condition: service_healthy
-
   # This container runs the actual web app in a php:8.4-fpm
   # base container.
   app:
-    image: code.caldwell.digital/home/torsearch-app:0.14.8
+    image: code.caldwell.digital/home/torsearch-app:latest
+    ports:
+      - '8006:80'
     env_file:
       - .env
     depends_on:
@@ -29,11 +23,11 @@ services:
   # This container runs a Symfony worker process.
   # See: https://symfony.com/doc/current/messenger.html
   worker:
-    image: code.caldwell.digital/home/torsearch-worker:0.14.8
+    image: code.caldwell.digital/home/torsearch-worker:latest
     volumes:
-      - ./downloads/movies:/var/download/movies
-      - ./downloads/tvshows:/var/download/tvshows
-    command: php ./bin/console messenger:consume async -v --time-limit=3600 --limit=10
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
+    command: -v --time-limit=3600 --limit=10
     env_file:
       - .env
     depends_on:
@@ -46,10 +40,10 @@ services:
   # This container runs a Symfony worker process.
   # See: https://symfony.com/doc/current/messenger.html
   scheduler:
-    image: code.caldwell.digital/home/torsearch-worker:0.14.8
+    image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
       - ./downloads:/var/download
-    command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
+    command: -vv --time-limit=3600
     env_file:
       - .env
     depends_on: