chore: speeds up startup healthchecks

Dockerfile

@@ -1,19 +1,20 @@
-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 apk add --no-cache \
-RUN echo 'pm = dynamic' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+      php84-opcache \
-    echo 'pm.max_children = 75' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+      php84-pdo_mysql \
-    echo 'pm.start_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+      php84-simplexml
-    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 && \
+USER nobody
-    echo 'pm.process_idle_timeout = 10s' >> /usr/local/etc/php-fpm.d/zz-docker.conf
 
 COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
+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" ]
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/var/www/bin/console", "startup:status" ]
 
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 
 WORKDIR /var/www
+

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

@@ -1,18 +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
 
-# Start Apache in the foreground
+/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
-echo "Starting PHP-FPM..."
-php-fpm
-
-exec "$@"
-

bash/nginx.conf

@@ -20,11 +20,13 @@ server {
     }
 
     location ~ \.php$ {
-        fastcgi_pass app:9000;
+        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 $document_root$fastcgi_script_name;
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
-        fastcgi_param DOCUMENT_ROOT $document_root;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
         internal;
     }
 }

compose.yml

@@ -12,14 +12,6 @@ services:
       - $PWD/bash/caddy:/etc/caddy
       - $PWD/bash/certs:/etc/ssl
 
-  web:
-    build:
-      dockerfile: docker/Dockerfile.web
-      context: .
-    depends_on:
-      app:
-        condition: service_healthy
-
   redis:
     image: redis:latest
     volumes:
@@ -29,8 +21,10 @@ services:
 
   app:
     build:
-      dockerfile: docker/Dockerfile.app
+      dockerfile: Dockerfile
       context: .
+    ports:
+      - "8001:80"
     volumes:
       - ./:/var/www
     depends_on:
@@ -45,7 +39,7 @@ services:
       - ./:/app
       - ./var/downloads/movies:/var/download/movies
       - ./var/downloads/tvshows:/var/download/tvshows
-    command: -v --time-limit=3600 --limit=10
+    command: -vvv --time-limit=3600
     env_file:
       - .env
     depends_on:
@@ -95,7 +89,8 @@ services:
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
       test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      timeout: 10s
+      interval: 5s
+      timeout: 5s
       retries: 10
 
   adminer:

config/packages/messenger.yaml

@@ -29,6 +29,7 @@ framework:
             'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
             'App\Monitor\Action\Command\MonitorTvShowCommand': async
             'App\Monitor\Action\Command\MonitorMovieCommand': async
+            'App\Torrentio\Action\Command\GetTvShowOptionsCommand': async
 
 # when@test:
 #    framework:

docker/Dockerfile.app

@@ -1,17 +1,17 @@
-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 apk add --no-cache \
-RUN echo 'pm = dynamic' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+      php84-opcache \
-    echo 'pm.max_children = 75' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+      php84-pdo_mysql \
-    echo 'pm.start_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+      php84-simplexml
-    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 --chown=www-data:www-data . /var/www
+USER nobody
+
+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
 
 HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
 

docker/Dockerfile.web

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

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:latest
+    ports:
+      - '8006:80'
     env_file:
       - .env
     depends_on:
@@ -36,6 +30,7 @@ services:
     command: -v --time-limit=3600 --limit=10
     env_file:
       - .env
+    restart: always
     depends_on:
       app:
         condition: service_healthy
@@ -52,6 +47,7 @@ services:
     command: -vv --time-limit=3600
     env_file:
       - .env
+    restart: always
     depends_on:
       app:
         condition: service_healthy

src/Controller/SearchController.php

@@ -6,18 +6,20 @@ use App\Search\Action\Handler\GetMediaInfoHandler;
 use App\Search\Action\Handler\SearchHandler;
 use App\Search\Action\Input\GetMediaInfoInput;
 use App\Search\Action\Input\SearchInput;
-use Carbon\Carbon;
+use App\Tmdb\TmdbResult;
+use App\Torrentio\Action\Command\GetMovieOptionsCommand;
+use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Cache\ItemInterface;
 
 final class SearchController extends AbstractController
 {
     public function __construct(
         private SearchHandler $searchHandler,
         private GetMediaInfoHandler $getMediaInfoHandler,
+        private MessageBusInterface $bus,
     ) {}
 
     #[Route('/search', name: 'app_search', methods: ['GET'])]
@@ -36,6 +38,8 @@ final class SearchController extends AbstractController
         GetMediaInfoInput $input,
     ): Response {
         $result = $this->getMediaInfoHandler->handle($input->toCommand());
+        $this->warmDownloadOptionCache($result->media);
+
         return $this->render('search/result.html.twig', [
             'results' => $result,
             'filter' => [
@@ -48,4 +52,32 @@ final class SearchController extends AbstractController
             ]
         ]);
     }
+
+    private function warmDownloadOptionCache(TmdbResult $result)
+    {
+        if ($result->mediaType === 'tvshows') {
+            // dispatches a job to get the download options
+            // for each episode and load them in cache
+            foreach ($result->episodes as $season => $episodes) {
+                // Only do the first 2 seasons, so we reduce
+                // getting rate-limited by Torrentio
+                if ($season > 2) {
+                    return;
+                }
+                foreach ($episodes as $episode) {
+                    $this->bus->dispatch(new GetTvShowOptionsCommand(
+                        tmdbId: $result->tmdbId,
+                        imdbId: $result->imdbId,
+                        season: $season,
+                        episode: $episode['episode_number'],
+                    ));
+                }
+            }
+        } elseif ($result->mediaType === 'movies') {
+            $this->bus->dispatch(new GetMovieOptionsCommand(
+                $result->tmdbId,
+                $result->imdbId,
+            ));
+        }
+    }
 }

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;