fix: updates local deploy compose

Dockerfile

@@ -1,19 +1,14 @@
-FROM php:8.4-fpm-alpine3.21
+FROM dunglas/frankenphp
 
-RUN docker-php-ext-install pdo_mysql
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-# 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 install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
 
-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
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]

bash/entrypoint.sh

@@ -1,13 +1,12 @@
 #!/bin/sh
 
 # Sleep for a second to ensure DB is awake and ready
-SLEEP_TIME=$(shuf -i 2-5 -n 1)
+SLEEP_TIME=$(shuf -i 2-4 -n 1)
 echo "> Sleeping for ${SLEEP_TIME} seconds to wait for the database"
-echo "> If there are errors after the migration runs, it's possible another container (scheduler, worker, etc.) already ran the migrations"
 sleep $SLEEP_TIME
 
 # Provision database
-php /var/www/bin/console doctrine:migrations:migrate --no-interaction
-php /var/www/bin/console db:seed
+php /app/bin/console doctrine:migrations:migrate --no-interaction
+php /app/bin/console db:seed
 
-/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
+exec docker-php-entrypoint "$@"

compose.yml

@@ -12,6 +12,26 @@ services:
       - $PWD/bash/caddy:/etc/caddy
       - $PWD/bash/certs:/etc/ssl
 
+  app:
+    build: .
+    restart: unless-stopped
+    environment:
+      FRANKENPHP_CONFIG: "worker /app/public/index.php"
+    volumes:
+      - $PWD:/app
+    tty: true
+    depends_on:
+      database:
+        condition: service_healthy
+
+  worker:
+    build: .
+    restart: unless-stopped
+    volumes:
+      - $PWD:/app
+    tty: true
+    command: php /app/bin/console messenger:consume async -vv
+
   redis:
     image: redis:latest
     volumes:
@@ -19,45 +39,6 @@ services:
     command: redis-server --maxmemory 512MB
     restart: unless-stopped
 
-  app:
-    build:
-      dockerfile: docker/Dockerfile.app
-      context: .
-    ports:
-      - "8001:80"
-    volumes:
-      - ./:/var/www
-    depends_on:
-      database:
-        condition: service_healthy
-
-  worker:
-    build:
-      dockerfile: docker/Dockerfile.worker
-      context: .
-    volumes:
-      - ./:/app
-      - ./var/downloads/movies:/var/download/movies
-      - ./var/downloads/tvshows:/var/download/tvshows
-    command: -vvv --time-limit=3600
-    env_file:
-      - .env
-    depends_on:
-      app:
-        condition: service_healthy
-
-  scheduler:
-    build:
-      dockerfile: docker/Dockerfile.scheduler
-      context: .
-    volumes:
-      - ./:/var/www
-      - ./var/download:/var/download
-    command: -vv --time-limit=3600
-    depends_on:
-      app:
-        condition: service_healthy
-
   mercure:
     image: dunglas/mercure
     restart: unless-stopped
@@ -89,7 +70,8 @@ services:
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
       test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      timeout: 10s
+      interval: 5s
+      timeout: 5s
       retries: 10
 
   adminer:

composer.json

@@ -22,6 +22,7 @@
         "p3k/emoji-detector": "^1.2",
         "php-tmdb/api": "^4.1",
         "predis/predis": "^2.4",
+        "runtime/frankenphp-symfony": "^0.2.0",
         "symfony/asset": "7.2.*",
         "symfony/console": "7.2.*",
         "symfony/doctrine-messenger": "7.2.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "33f1579a34e7ada02bb4738a9b39f493",
+    "content-hash": "c4ad1f54b8dd44fb55097f631c945460",
     "packages": [
         {
             "name": "1tomany/rich-bundle",
@@ -3300,6 +3300,58 @@
             },
             "time": "2021-10-29T13:26:27+00:00"
         },
+        {
+            "name": "runtime/frankenphp-symfony",
+            "version": "0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-runtime/frankenphp-symfony.git",
+                "reference": "56822c3631d9522a3136a4c33082d006bdfe4bad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-runtime/frankenphp-symfony/zipball/56822c3631d9522a3136a4c33082d006bdfe4bad",
+                "reference": "56822c3631d9522a3136a4c33082d006bdfe4bad",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+                "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
+                "symfony/runtime": "^5.4 || ^6.0 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Runtime\\FrankenPhpSymfony\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kévin Dunglas",
+                    "email": "kevin@dunglas.dev"
+                }
+            ],
+            "description": "FrankenPHP runtime for Symfony",
+            "support": {
+                "issues": "https://github.com/php-runtime/frankenphp-symfony/issues",
+                "source": "https://github.com/php-runtime/frankenphp-symfony/tree/0.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/nyholm",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-12T12:06:11+00:00"
+        },
         {
             "name": "symfony/asset",
             "version": "v7.2.0",

deploy.compose.yml

@@ -1,38 +1,41 @@
 services:
-  web:
-    image: code.caldwell.digital/home/torsearch/web:latest
+  app:
+    image: registry.caldwell.digital/home/torsearch-app:latest
     ports:
       - '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
+    depends_on:
+      - database
+
 
   worker:
-    image: code.caldwell.digital/home/torsearch/app:${TAG}
+    image: registry.caldwell.digital/home/torsearch-worker:latest
     volumes:
-      - /mnt/media/downloads:/var/download
-    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
+    restart: always
+    command: -vv
     deploy:
-      replicas: 2
+      replicas: 4
+    depends_on:
+      - app
+
 
   scheduler:
-    image: code.caldwell.digital/home/torsearch/app:${TAG}
+    image: registry.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
-      - /mnt/media/downloads:/var/download
-    command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
+      - ./downloads:/var/download
+    restart: always
+    depends_on:
+      - app
+
 
   mercure:
     image: dunglas/mercure
     restart: unless-stopped
     ports:
-      - "3000:80"
+      - "3001:80"
     environment:
       SERVER_NAME: ':80'
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
@@ -45,6 +48,34 @@ services:
       - mercure_data:/data
       - mercure_config:/config
 
+
+  database:
+    image: mariadb:10.11.2
+    volumes:
+      - mysql:/var/lib/mysql
+    environment:
+      MYSQL_DATABASE: app
+      MYSQL_USERNAME: app
+      MYSQL_PASSWORD: password
+      MYSQL_ROOT_PASSWORD: password
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+
+
+  redis:
+    image: redis:latest
+    volumes:
+      - redis_data:/data
+    command: redis-server --maxmemory 512MB
+    restart: unless-stopped
+
+
 volumes:
+  mysql:
   mercure_config:
   mercure_data:
+  redis_data:
+

docker/Dockerfile.app

@@ -1,19 +1,22 @@
-FROM trafex/php-nginx:3.9.0
+FROM dunglas/frankenphp
 
-USER root
+ENV FRANKENPHP_CONFIG="worker /app/public/index.php 20"
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-RUN apk add --no-cache \
-      php84-pdo_mysql \
-      php84-simplexml
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
 
-USER nobody
+COPY . /app
+COPY --chmod=775 ./bash/entrypoint.sh /usr/local/bin/docker-entrypoint
 
-COPY --chown=nobody:nobody . /var/www
-COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
-COPY --chmod=0755 ./bash/nginx.conf /etc/nginx/conf.d/site.conf
+ENTRYPOINT [ "/usr/local/bin/docker-entrypoint" ]
 
-HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
+CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ]
 
-ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
-
-WORKDIR /var/www
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]

docker/Dockerfile.scheduler

@@ -1,7 +1,16 @@
-FROM php:8.4-cli-alpine3.21
+FROM dunglas/frankenphp
 
-RUN docker-php-ext-install pdo_mysql
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-COPY --chown=www-data:www-data . /app
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
 
-ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume",  "scheduler_monitor" ]
+COPY . /app
+
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "schedule_monitor" ]

docker/Dockerfile.web

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

docker/Dockerfile.worker

@@ -1,7 +1,18 @@
-FROM php:8.4-cli-alpine3.21
+FROM dunglas/frankenphp:php8.4-alpine
 
-RUN docker-php-ext-install pdo_mysql
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-COPY --chown=www-data:www-data . /app
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
 
-ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume",  "async" ]
+COPY . /app
+
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]
+
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0

docker/app/supervisord.conf

@@ -0,0 +1,9 @@
+[program:messenger-consume]
+command=php /var/www/bin/console messenger:consume async --time-limit=3600
+user=nobody
+numprocs=2
+startsecs=0
+autostart=true
+autorestart=true
+startretries=10
+process_name=%(program_name)s_%(process_num)02d

docs/examples/.env

@@ -19,13 +19,17 @@ DATABASE_URL="mysql://root:password@database:3306/app?serverVersion=10.6.19.2-Ma
 # This key is never saved anywhere
 # else and is passed to Torrentio
 # to retrieve download options
-REAL_DEBRID_KEY=""
+#REAL_DEBRID_KEY=""
 
 # Enter you TMDB API key
 # This is used to provide rich search results
 # when searching for media and rendering the
 # Popular Movies and TV Shows section.
-TMDB_API=
+#TMDB_API=
+
+REAL_DEBRID_KEY="QYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ"
+TMDB_API=eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiI0ZTJjYjJhOGUzOGJhNjdiNjVhOGU1NGM0ZWI1MzhmOCIsIm5iZiI6MTczNzkyNjA0NC41NjQsInN1YiI6IjY3OTZhNTljYzdiMDFiNzJjNzIzZWM5YiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.e8DbNe9qrSBC1y-ANRv-VWBAtls-ZS2r7aNCiI68mpw
+
 
 MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
 

docs/examples/compose.yml

@@ -27,7 +27,7 @@ services:
     volumes:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
-    command: -v --time-limit=3600 --limit=10
+    command: -vvv
     env_file:
       - .env
     restart: always
@@ -44,7 +44,6 @@ services:
     image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
       - ./downloads:/var/download
-    command: -vv --time-limit=3600
     env_file:
       - .env
     restart: always
@@ -84,7 +83,8 @@ services:
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
       test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      timeout: 10s
+      interval: 5s
+      timeout: 5s
       retries: 10
 
   redis:

docs/examples/swarm.compose.yml

@@ -0,0 +1,115 @@
+services:
+  # 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-app:latest
+    ports:
+      - '8006:80'
+    configs:
+      - env_file
+    deploy:
+      replicas: 2
+    depends_on:
+      - database
+
+  # 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
+  # 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-worker:latest
+    configs:
+      - source: env_file
+        target: /app/bin/.env.local
+    volumes:
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
+    restart: always
+    command: -vv
+    deploy:
+      replicas: 4
+    depends_on:
+      - app
+
+  # This container handles the monitoring for new media. When new
+  # monitors are added, jobs are periodically dispatched to this
+  # container, and the desired media is searched for and downloaded.
+  # This container runs a Symfony worker process.
+  # See: https://symfony.com/doc/current/messenger.html
+  scheduler:
+    image: code.caldwell.digital/home/torsearch-scheduler:latest
+    configs:
+      - env_file
+    volumes:
+      - ./downloads:/var/download
+    restart: always
+    depends_on:
+      - app
+
+  # This container facilitates viewing the progress of downloads
+  # in realtime. It also handles sending alerts and notifications.
+  # The MERCURE_PUBLISHER_JWT key & MERCURE_SUBSCRIBER_JWT_KEY should
+  # match the MERCURE_JWT_SECRET environment variable.
+  mercure:
+    image: dunglas/mercure
+    restart: unless-stopped
+    ports:
+      - "3001:80"
+    environment:
+      SERVER_NAME: ':80'
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_EXTRA_DIRECTIVES: |
+        cors_origins *
+        anonymous
+    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
+    volumes:
+      - mercure_data:/data
+      - mercure_config:/config
+
+  database:
+    image: mariadb:10.11.2
+    volumes:
+      - mysql:/var/lib/mysql
+    environment:
+      MYSQL_DATABASE: app
+      MYSQL_USERNAME: app
+      MYSQL_PASSWORD: password
+      MYSQL_ROOT_PASSWORD: password
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+
+  redis:
+    image: redis:latest
+    volumes:
+      - redis_data:/data
+    command: redis-server --maxmemory 512MB
+    restart: unless-stopped
+
+  # **Optional**
+  # Provides a simple method of viewing the database
+  adminer:
+    image: adminer
+    ports:
+      - "8081:8080"
+
+volumes:
+  mysql:
+  mercure_config:
+  mercure_data:
+  redis_data:
+
+configs:
+  env_file:
+    file: $PWD/.env
+

src/Download/Framework/Controller/ApiController.php

@@ -56,4 +56,4 @@ class ApiController extends AbstractController
 
         return $this->json(['status' => 200, 'message' => 'Added to Queue']);
     }
-}
+}

src/User/Framework/Controller/Web/LoginController.php

@@ -2,10 +2,8 @@
 
 namespace App\User\Framework\Controller\Web;
 
-use App\User\Action\Handler\RegisterUserHandler;
 use App\User\Framework\Repository\UserRepository;
 use Doctrine\Common\Collections\ArrayCollection;
-use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;