fix: removes default movies & tvshows paths from .env

.env

@@ -38,6 +38,3 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 ###< symfony/messenger ###
 
 REDIS_HOST=redis://redis
-
-MOVIES_PATH=/var/download/movies
-TVSHOWS_PATH=/var/download/tvshows

.gitignore

@@ -1,4 +1,5 @@
 .idea
+bolt.db
 ###> symfony/framework-bundle ###
 /.env.local
 /.env.local.php

Dockerfile

@@ -13,4 +13,4 @@ RUN install-php-extensions \
 
 HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
 
-COPY docker/app/site.caddyfile /etc/frankenphp/Caddyfile
+COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile

bash/app/wget_download.sh

@@ -1,2 +0,0 @@
-# $1 = movies/tvshows/etc, $2 = title of media, $3 = URL of download
-cd /var/download/${1} && if [ ! -d "${2}" ]; then mkdir "${2}"; fi && cd "${2}" && wget "${3}"

bash/nginx.conf

@@ -1,32 +0,0 @@
-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;
-    }
-}

compose.yml

@@ -35,7 +35,16 @@ services:
     volumes:
       - $PWD:/app
     tty: true
-    command: php /app/bin/console messenger:consume async -vv
+    command: php /app/bin/console messenger:consume async -vv --time-limit=3600 limit=10
+
+
+  scheduler:
+    build: .
+    restart: unless-stopped
+    volumes:
+      - $PWD:/app
+    command: php /app/bin/console messenger:consume scheduler_monitor -vv
+    tty: true
 
 
   redis:

deploy.compose.yml

@@ -23,9 +23,9 @@ services:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
     restart: always
-    command: -vv
+    command: -vv --time-limit=3600 --limit=10
     deploy:
-      replicas: 4
+      replicas: 2
     depends_on:
       - app
 
@@ -33,8 +33,10 @@ services:
   scheduler:
     image: registry.caldwell.digital/home/torsearch-scheduler:${TAG}
     volumes:
-      - ./downloads:/var/download
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
     restart: always
+    command: -vv
     depends_on:
       - app
 

docker/Dockerfile.app

@@ -2,6 +2,7 @@ FROM dunglas/frankenphp
 
 ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
 RUN install-php-extensions \
 	pdo_mysql \
@@ -11,11 +12,11 @@ RUN install-php-extensions \
 	opcache
 
 COPY . /app
-COPY --chmod=775 ./bash/entrypoint.sh /usr/local/bin/docker-entrypoint
+COPY --chmod=775 docker/app/entrypoint.sh /usr/local/bin/docker-entrypoint
 COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile
 
 ENTRYPOINT [ "/usr/local/bin/docker-entrypoint" ]
 
-CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ]
+CMD [ "frankenphp", "run", "--config", "/etc/frankenphp/Caddyfile" ]
 
 HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]

docker/Dockerfile.scheduler

@@ -1,4 +1,4 @@
-FROM dunglas/frankenphp
+FROM dunglas/frankenphp:php8.4-alpine
 
 ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
@@ -13,4 +13,6 @@ RUN install-php-extensions \
 
 COPY . /app
 
-ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "schedule_monitor" ]
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
+
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0

docker/app/Caddyfile

@@ -4,12 +4,7 @@
 	frankenphp {
 		{$FRANKENPHP_CONFIG}
 
-		worker {
-			file ./public/index.php
-			num 20
-			env APP_RUNTIME Runtime\FrankenPhpSymfony\Runtime
-			{$FRANKENPHP_WORKER_CONFIG}
-		}
+
 	}
 }
 

docker/app/supervisord.conf

@@ -1,9 +0,0 @@
-[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

nomad.deploy.hcl

@@ -0,0 +1,129 @@
+variable "image_tag" {
+  type        = string
+  description = "Docker image tag to deploy."
+  default     = "latest"
+}
+
+job "torsearch" {
+  datacenters = [ "home" ]
+  type = "service"
+
+  group "app" {
+    count = 2
+
+    update {
+      max_parallel     = 4
+      min_healthy_time = "30s"
+      healthy_deadline = "3m"
+      auto_revert = true
+    }
+
+    network {
+      port "app" {
+        to = 80
+      }
+    }
+
+    task "app" {
+      driver = "docker"
+
+      config {
+        image = "registry.caldwell.digital/home/torsearch-app:${var.image_tag}"
+        ports = ["app"]
+      }
+
+      env {
+        MERCURE_PUBLISHER_JWT_KEY = "!ChangeThisMercureHubJWTSecretKey!"
+        MERCURE_SUBSCRIBER_JWT_KEY = "!ChangeThisMercureHubJWTSecretKey!"
+      }
+
+      service {
+        name = "torsearch-app"
+        provider = "nomad"
+        port = "app"
+
+        meta {
+          nomad_ingress_enabled  = true
+          nomad_ingress_hostname = "torsearch-nomad.caldwell.digital"
+        }
+      }
+    }
+  }
+
+  group "worker" {
+    count = 2
+    update {
+      max_parallel     = 4
+      min_healthy_time = "30s"
+      healthy_deadline = "3m"
+      auto_revert = true
+    }
+
+    volume "media" {
+      type = "host"
+      source = "media"
+      read_only = false
+    }
+
+    task "worker" {
+      driver = "docker"
+
+      volume_mount {
+        volume      = "media"
+        destination = "/var/download"
+        read_only = false
+      }
+
+      config {
+        image = "registry.caldwell.digital/home/torsearch-worker:${var.image_tag}"
+        args = [
+          "-vv"
+        ]
+      }
+
+      service {
+        name = "torsearch-worker"
+        provider = "nomad"
+      }
+    }
+  }
+
+  group "scheduler" {
+    count = 1
+
+    update {
+      max_parallel     = 2
+      min_healthy_time = "30s"
+      healthy_deadline = "3m"
+      auto_revert = true
+    }
+
+    volume "media" {
+      type = "host"
+      source = "media"
+      read_only = false
+    }
+
+    task "scheduler" {
+      driver = "docker"
+
+      volume_mount {
+        volume      = "media"
+        destination = "/var/download"
+        read_only = false
+      }
+
+      config {
+        image = "registry.caldwell.digital/home/torsearch-scheduler:${var.image_tag}"
+        args = [
+          "-vv"
+        ]
+      }
+
+      service {
+        name = "torsearch-scheduler"
+        provider = "nomad"
+      }
+    }
+  }
+}