fix(Worker): pulls /app from app image again

.dockerignore

@@ -12,3 +12,4 @@ phpstan.dist.neon
 phpunit.dist.xml
 nomad.deploy.hcl
 deployment.properties
+var/download/*

bash/build_base.sh

@@ -1,14 +1,22 @@
 # torsearch-app is built from this base
 export APP_FRANKENPHP_TAG=php8.4
 
-docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" .
+#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" .
+docker build -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" .
 docker push code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG}
 docker push code.caldwell.digital/home/torsearch-base:latest
 
 # torsearch-worker & torsearch-scheduler are built from this base
 export WORKER_FRANKENPHP_TAG=php8.4-alpine
 
-docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" .
+#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" .
+docker build -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" .
 docker push code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG}
 docker push code.caldwell.digital/home/torsearch-base-worker:latest
 
+# torsearch-worker-supervisord
+export ALPINE_VERSION=3.22
+
+#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
+docker build -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
+docker push code.caldwell.digital/home/torsearch-base-worker-supervisord:latest

compose.yml

@@ -33,12 +33,9 @@ services:
 
 
   worker:
-#    build:
-#      dockerfile: docker/Dockerfile.base.worker
-#      context: .
-#      args:
-#        FRANKENPHP_TAG: php8.4-alpine
-    image: torsearch-alpine
+    build:
+      dockerfile: docker/Dockerfile.worker
+      context: .
     restart: unless-stopped
     volumes:
       - $PWD:/app
@@ -46,22 +43,19 @@ services:
     tty: true
     environment:
       TZ: America/Chicago
-#    command: php /app/bin/console messenger:consume async --time-limit=3600 -vv
-
 
   scheduler:
     build:
-      dockerfile: docker/Dockerfile.base.worker
+      dockerfile: docker/Dockerfile.scheduler
       context: .
-      args:
-        FRANKENPHP_TAG: php8.4-alpine
     restart: unless-stopped
     volumes:
       - $PWD:/app
+      - $PWD/var/download:/var/download
+    tty: true
     environment:
       TZ: America/Chicago
-    command: php /app/bin/console messenger:consume scheduler_monitor -vv
-    tty: true
+      WORKER_MONITOR: 2
 
 
   redis:

config/packages/messenger.yaml

@@ -22,7 +22,7 @@ framework:
                     check_delayed_interval: 60000
                     queue_name: download
                 retry_strategy:
-                    max_retries: 1
+                    max_retries: 3
                     multiplier: 1
 
             monitor:
@@ -58,10 +58,10 @@ framework:
             # 'App\Message\YourMessage': async
             'App\Download\Action\Command\DownloadMediaCommand': download
             'App\Download\Action\Command\DownloadSeasonCommand': async
-            'App\Monitor\Action\Command\MonitorTvEpisodeCommand': async
-            'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
-            'App\Monitor\Action\Command\MonitorTvShowCommand': async
-            'App\Monitor\Action\Command\MonitorMovieCommand': async
+            'App\Monitor\Action\Command\MonitorTvEpisodeCommand': monitor
+            'App\Monitor\Action\Command\MonitorTvSeasonCommand': monitor
+            'App\Monitor\Action\Command\MonitorTvShowCommand': monitor
+            'App\Monitor\Action\Command\MonitorMovieCommand': monitor
             'App\Torrentio\Action\Command\GetTvShowOptionsCommand': media_cache
 
 # when@test:

deploy.compose.yml

@@ -13,8 +13,6 @@ services:
       - /mnt/media/downloads/tvshows:/var/download/tvshows
       - mercure_data:/data
       - mercure_config:/config
-    depends_on:
-      - database
 
 
   worker:
@@ -22,36 +20,21 @@ services:
     volumes:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
-    restart: always
-#    command: -vv --time-limit=3600 --limit=10
     deploy:
       replicas: 2
     depends_on:
       - app
 
-#
-#  scheduler:
-#    image: registry.caldwell.digital/home/torsearch-scheduler:${TAG}
-#    volumes:
-#      - /mnt/media/downloads/movies:/var/download/movies
-#      - /mnt/media/downloads/tvshows:/var/download/tvshows
-#    restart: always
-#    command: -vv
-#    depends_on:
-#      - app
 
-
-  redis:
-    image: redis:latest
+  scheduler:
+    image: registry.caldwell.digital/home/torsearch-scheduler:${TAG}
     volumes:
-      - redis_data:/data
-    command: redis-server --maxmemory 512MB
-    restart: unless-stopped
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
+    depends_on:
+      - app
 
 
 volumes:
-  mysql:
   mercure_config:
   mercure_data:
-  redis_data:
-

docker/Dockerfile.base.worker

@@ -1,19 +1,39 @@
-ARG FRANKENPHP_TAG
+#####
+# This version of Torsearch runs the scheduler, downloader, and worker
+# in a single container. Each process is managerd by supervisord
+# and can be configured via environment variables and more
+# than one of these containers cans till be run.
+#####
+ARG ALPINE_VERSION="3.22"
+FROM alpine:${ALPINE_VERSION} AS build_stage
 
-FROM dunglas/frankenphp:${FRANKENPHP_TAG}
+RUN apk add --no-cache \
+  curl \
+  php84 \
+  php84-ctype \
+  php84-curl \
+  php84-dom \
+  php84-fileinfo \
+  php84-fpm \
+  php84-gd \
+  php84-mbstring \
+  php84-mysqli \
+  php84-opcache \
+  php84-openssl \
+  php84-pdo_mysql \
+  php84-tokenizer \
+  supervisor
 
-ENV SERVER_NAME=":80"
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+RUN ln -s /usr/bin/php84 /usr/bin/php
 
-ARG APP_VERSION="0.dev"
-ENV APP_VERSION="${APP_VERSION}"
+RUN mkdir -p /etc/supervisor/conf.d
 
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
+# We start supervisord and supervisord starts
+# respective service in the configuration file.
+ENTRYPOINT ["/app/bin/console", "init:worker"]
+
+# Message transports can be enabled by passing them as command options.
+# Inlcluding a number with the option will start that amount of processes
+# for the transport. Not supplying a number will default to 1.
+# --download --monitor OR --download 2 --monitor
 
-RUN apk add --no-cache wget

docker/Dockerfile.scheduler

@@ -1,10 +1,21 @@
-FROM code.caldwell.digital/home/torsearch-base-worker:php8.4-alpine
+###
+# This version of Torsearch can run the scheduler, downloader, and
+# worker in one container. Each process is managerd by supervisord
+# and can be configured via environment variables, and more than
+# one of these containers can still be run.
+###
 
-ARG APP_VERSION="0.0.0-dev"
-ENV APP_VERSION="${APP_VERSION}"
+# Default to latest, but should pass in a version
+ARG APP_VERSION="latest"
 
-COPY . /app
+# Start with our base worker image
+FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
 
-ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
+# Set the APP_VERSION in the image
+ENV APP_VERSION=${APP_VERSION}
 
-HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0
+# Copy the actual application code from the previously built app
+COPY --chown=1000:1000 ./ /app
+
+# To retain backwards compatibility, default to async & download transports
+CMD [ "--monitor" ]

docker/Dockerfile.worker

@@ -1,40 +1,24 @@
 ###
-# This version of Torsearch runs the scheduler, downloader, and worker
-# in this one container. Each process is managerd by supervisord
-# and can be configured via environment variables and more
-# than one of these containers cans till be run.
+# This version of Torsearch can run the scheduler, downloader, and
+# worker in one container. Each process is managerd by supervisord
+# and can be configured via environment variables, and more than
+# one of these containers can still be run.
 ###
+
+# Default to latest, but should pass in a version
 ARG APP_VERSION="latest"
 
-FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS base_image
+# Set aside the actual app image so we can copy the app from there
+FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
 
+# Start with our base worker image
+FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
 
-FROM alpine:3.22 AS build_stage
+# Set the APP_VERSION in the image
+ENV APP_VERSION=${APP_VERSION}
 
-COPY --from=base_image --chown=1000:1000 /app /app
+# Copy the actual application code from the previously built app
+COPY --chown=1000:1000 --from=app_image /app /app
 
-RUN apk add --no-cache \
-  curl \
-  nginx \
-  php84 \
-  php84-ctype \
-  php84-curl \
-  php84-dom \
-  php84-fileinfo \
-  php84-fpm \
-  php84-gd \
-  php84-mbstring \
-  php84-mysqli \
-  php84-opcache \
-  php84-openssl \
-  php84-pdo_mysql \
-  php84-tokenizer \
-  supervisor
-
-RUN ln -s /usr/bin/php84 /usr/bin/php
-
-COPY docker/worker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-# We start supervisord and supervisord starts
-# respective service in the configuration file.
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+# To retain backwards compatibility, default to async & download transports
+CMD [ "--async", "--download" ]

docker/worker/async.conf

@@ -0,0 +1,10 @@
+[program:torsearch-worker]
+command=/app/bin/console messenger:consume async -vv --time-limit 3600
+numprocs=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

docker/worker/download.conf

@@ -0,0 +1,10 @@
+[program:torsearch-downloader]
+command=/app/bin/console messenger:consume download -vv --time-limit 3600
+numprocs=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

docker/worker/monitor.conf

@@ -0,0 +1,10 @@
+[program:torsearch-scheduler]
+command=/app/bin/console messenger:consume scheduler_monitor monitor -vv --time-limit 21600
+numprocs=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

docker/worker/supervisord.conf

@@ -3,25 +3,3 @@ nodaemon=true
 logfile=/dev/null
 logfile_maxbytes=0
 pidfile=/run/supervisord.pid
-
-[program:torsearch-worker]
-command=/app/bin/console messenger:consume download -vv --time-limit 3600
-numprocs=1
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-autorestart=true
-startretries=3
-process_name=%(program_name)s_%(process_num)02d
-
-[program:torsearch-scheduler]
-command=/app/bin/console messenger:consume monitor -vv
-numprocs=1
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-autorestart=true
-startretries=3
-process_name=%(program_name)s_%(process_num)02d

src/Base/Framework/Command/InitWorker.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Base\Framework\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Twig\Environment;
+
+class InitWorker extends Command
+{
+    public function __construct(
+        private Environment $twig,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setName('init:worker')
+            ->addOption('async', null, InputOption::VALUE_OPTIONAL, 'Run the async worker.',false)
+            ->addOption('download', null, InputOption::VALUE_OPTIONAL, 'Run the download worker.', false)
+            ->addOption('monitor', null, InputOption::VALUE_OPTIONAL, 'Run the monitor worker.', false)
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $configFile = $this->twig->render("config/supervisord.conf.twig", []);
+
+        if ($this->optionExists($input, $output, 'async')) {
+            $configFile .= $this->twig->render("config/async.conf.twig", [
+                'replicas' => $this->getOptionValue('async', $input),
+            ]) . "\n\n";
+        }
+
+        if ($this->optionExists($input, $output, 'download')) {
+            $configFile .= $this->twig->render("config/download.conf.twig", [
+                'replicas' => $this->getOptionValue('download', $input),
+            ]). "\n\n";
+        }
+
+        if ($this->optionExists($input, $output, 'monitor')) {
+            $configFile .= $this->twig->render("config/monitor.conf.twig", [
+                'replicas' => $this->getOptionValue('monitor', $input),
+            ]). "\n\n";
+        }
+
+        if ("" !== $configFile) {
+            $output->writeln("[init:worker] Writing /etc/supervisor/conf.d/supervisord.conf");
+            file_put_contents("/etc/supervisor/conf.d/supervisord.conf", $configFile);
+
+            $output->writeln("[init:worker] Starting supervisord");
+            shell_exec("/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf");
+            return Command::SUCCESS;
+        }
+
+        $output->writeln("[init:worker] No workers selected. Exiting.");
+        return Command::FAILURE;
+    }
+
+    private function optionExists(InputInterface $input, OutputInterface $output, string $option): bool
+    {
+        if ($input->getOption($option) !== false) {
+            $value = $input->getOption($option) ?? 1;
+            $output->writeln("[init:worker] transport: $option // $value // input var");;
+            return true;
+        }
+
+        $optionKey = 'WORKER_' . strtoupper($option);
+        if (array_key_exists($optionKey, $_SERVER) && $_SERVER[$optionKey] !== null && $_SERVER[$optionKey] !== '') {
+            $output->writeln("[init:worker] transport: $option // $_SERVER[$optionKey] // env var");
+            return true;
+        }
+
+        return false;
+    }
+
+    private function getOptionValue(string $option, InputInterface $input): int
+    {
+        if ($input->getOption($option) !== false) {
+            return $input->getOption($option) ?? 1;
+        }
+
+        $optionKey = 'WORKER_' . strtoupper($option);
+        return $_SERVER[$optionKey];
+    }
+}

templates/config/async.conf.twig

@@ -0,0 +1,10 @@
+[program:torsearch-worker]
+command=/app/bin/console messenger:consume async -vv --time-limit 3600
+numprocs={{ replicas|default(1) }}
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

templates/config/download.conf.twig

@@ -0,0 +1,10 @@
+[program:torsearch-downloader]
+command=/app/bin/console messenger:consume download -vv --time-limit 3600
+numprocs={{ replicas|default(1) }}
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

templates/config/monitor.conf.twig

@@ -0,0 +1,10 @@
+[program:torsearch-scheduler]
+command=/app/bin/console messenger:consume scheduler_monitor monitor -vv --time-limit 21600
+numprocs={{ replicas|default(1) }}
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

templates/config/supervisord.conf.twig

@@ -0,0 +1,5 @@
+[supervisord]
+nodaemon=true
+logfile=/dev/null
+logfile_maxbytes=0
+pidfile=/run/supervisord.pid