fix(Scheduler): copy from app image

bash/build_base.sh

@@ -1,19 +1,22 @@
 # torsearch-app is built from this base
 export APP_FRANKENPHP_TAG=php8.4
 
-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 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,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 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 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

docker/Dockerfile.base.worker

@@ -10,14 +10,18 @@ FROM alpine:${ALPINE_VERSION} AS build_stage
 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
 
 RUN ln -s /usr/bin/php84 /usr/bin/php

docker/Dockerfile.scheduler

@@ -8,6 +8,9 @@
 # Default to latest, but should pass in a version
 ARG APP_VERSION="latest"
 
+# 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
 
@@ -15,7 +18,7 @@ FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
 ENV APP_VERSION=${APP_VERSION}
 
 # Copy the actual application code from the previously built app
-COPY --chown=1000:1000 ./ /app
+COPY --chown=1000:1000 --from=app_image /app /app
 
 # To retain backwards compatibility, default to async & download transports
-CMD [ "--async", "--download" ]
+CMD [ "--monitor" ]

docker/Dockerfile.worker

@@ -8,6 +8,9 @@
 # Default to latest, but should pass in a version
 ARG APP_VERSION="latest"
 
+# 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
 
@@ -15,7 +18,7 @@ FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
 ENV APP_VERSION=${APP_VERSION}
 
 # Copy the actual application code from the previously built app
-COPY --chown=1000:1000 ./ /app
+COPY --chown=1000:1000 --from=app_image /app /app
 
 # To retain backwards compatibility, default to async & download transports
 CMD [ "--async", "--download" ]