fix: passes nginx config into app container

.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

Dockerfile

@@ -1,10 +1,19 @@
-FROM registry.caldwell.digital/library/php:8.4-apache
+FROM php:8.4-fpm-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 ./bash/vhost.conf /etc/apache2/sites-enabled/vhost.conf
-RUN rm /etc/apache2/sites-enabled/000-default.conf
+# 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
+
+COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
+
+HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
+
+ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+
+WORKDIR /var/www

Dockerfile.prod

@@ -7,5 +7,5 @@ RUN apt-get update && \
     docker-php-ext-install ldap
 
 COPY --chown=www-data:www-data . /var/www
-COPY ./bash/vhost.conf /etc/apache2/sites-enabled/vhost.conf
+COPY bash/nginx.conf /etc/apache2/sites-enabled/vhost.conf
 RUN rm /etc/apache2/sites-enabled/000-default.conf

bash/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Sleep for a second to ensure DB is awake and ready
 SLEEP_TIME=$(shuf -i 2-5 -n 1)
@@ -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 Apache..."
-exec apachectl -D FOREGROUND
-
-exec "$@"
-
+/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf

bash/nginx.conf

@@ -0,0 +1,32 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+
+    root /var/www/public;
+
+    location /hub/ {
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_redirect   off;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://mercure/;
+    }
+
+
+    location / {
+        # try to serve file directly, fallback to index.php
+        try_files $uri /index.php$is_args$args;
+    }
+
+    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;
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
+        internal;
+    }
+}

bash/vhost.conf

@@ -1,23 +0,0 @@
-<VirtualHost *:80>
-    ServerName localhost
-
-    DocumentRoot /var/www/public
-    DirectoryIndex /index.php
-
-    <LocationMatch "/hub/">
-        ProxyPass http://mercure:80/
-        ProxyPassReverse http://mercure:80/
-    </LocationMatch>
-
-    <Directory /var/www/public>
-        AllowOverride None
-        Order Allow,Deny
-        Allow from All
-
-        FallbackResource /index.php
-    </Directory>
-
-    <Directory /var/www/public/bundles>
-        FallbackResource disabled
-    </Directory>
-</VirtualHost>

compose.yml

@@ -20,7 +20,11 @@ services:
     restart: unless-stopped
 
   app:
-    image: code.caldwell.digital/home/torsearch:0.14.5-app
+    build:
+      dockerfile: docker/Dockerfile.app
+      context: .
+    ports:
+      - "8001:80"
     volumes:
       - ./:/var/www
     depends_on:
@@ -28,21 +32,28 @@ services:
         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

@@ -1,13 +1,21 @@
 services:
-  php:
-    image: registry.caldwell.digital/home/torsearch/app:${TAG}
+  web:
+    image: code.caldwell.digital/home/torsearch/web:latest
     ports:
-      - "8001:80"
+      - '8001:80'
+    volumes:
+      - $PWD/bash/nginx.conf:/etc/nginx/conf.d/default.conf
+    depends_on:
+      app:
+        condition: service_healthy
+
+  app:
+    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
@@ -15,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,19 @@
-FROM registry.caldwell.digital/library/php:8.4-apache
+FROM trafex/php-nginx:3.9.0
 
-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
+USER root
 
-COPY --chown=www-data:www-data . /var/www
+RUN apk add --no-cache \
+      php84-pdo_mysql \
+      php84-simplexml
+
+USER nobody
+
+COPY --chown=nobody:nobody . /var/www
 COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
-COPY ./bash/vhost.conf /etc/apache2/sites-enabled/vhost.conf
-RUN rm /etc/apache2/sites-enabled/000-default.conf
+COPY --chmod=0755 ./bash/nginx.conf /etc/nginx/conf.d/site.conf
 
 HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
 
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+
+WORKDIR /var/www

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.web

@@ -0,0 +1,3 @@
+FROM nginx:1.28-alpine
+
+COPY bash/nginx.conf /etc/nginx/conf.d/default.conf

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

@@ -1,30 +1,33 @@
 services:
-  # This container runs the actual web app in a php:8.4-apache
-  # base container. If not running behind a reverse proxy,
-  # inject your SSL certificates into this container
+  # The "entrypoint" into the application. This reverse proxy
+  # proxies traffic back to their respective services. If not
+  # running behind a reverse proxy inject your SSL certificates
+  # into this container.
+  # This container runs the actual web app in a php:8.4-fpm
+  # base container.
   app:
-    image: code.caldwell.digital/home/torsearch:0.14.5-app
+    image: code.caldwell.digital/home/torsearch-app:latest
     ports:
-      - "8006:80"
+      - '8006:80'
     env_file:
       - .env
     depends_on:
       database:
         condition: service_healthy
 
-  # Downloads happen asynchronously in this container. Replicate
-  # this container to run multiple downloads simultaneously.
+  # Downloads happen in this container. Replicate this
+  # container to run multiple downloads simultaneously.
   # Map your "movies" folder to /var/download/movies
-  # Map your TV shows folder to /var/download/tvshows
+  # Map your "TV shows" folder to /var/download/tvshows
   # If your folders are on another machine, use an NFS volume.
   # This container runs a Symfony worker process.
   # See: https://symfony.com/doc/current/messenger.html
   worker:
-    image: code.caldwell.digital/home/torsearch:0.14.5-worker
+    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:
@@ -37,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:0.14.5-worker
+    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: