task(ci): update base image

2026-03-10 23:58:47 -05:00 · 2026-03-10 23:57:11 -05:00 · 2026-03-10 23:55:52 -05:00 · 2026-03-10 23:51:32 -05:00 · 2026-03-10 23:48:12 -05:00 · 2026-03-10 23:09:20 -05:00
8 changed files with 94 additions and 17 deletions
--- a/.env
+++ b/.env
@@ -31,6 +31,8 @@ DATABASE_URL=

 ###< doctrine/doctrine-bundle ###
 MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
+MERCURE_PUBLISHER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!"
+MERCURE_SUBSCRIBER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!"
 ###> symfony/messenger ###
 # Choose one of the transports below
 # MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
--- a/.gitea/workflows/build_base_images.yml
+++ b/.gitea/workflows/build_base_images.yml
@@ -0,0 +1,74 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build-base-app:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: "${{ vars.REGISTRY_URL }}"
+          username: "${{ vars.REGISTRY_USER }}"
+          password: "${{ vars.REGISTRY_PASS }}"
+
+      - name: Create torsearch-app docker image
+        run: |
+          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 push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG}
+          docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base:latest
+
+  build-base-worker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: "${{ vars.REGISTRY_URL }}"
+          username: "${{ vars.REGISTRY_USER }}"
+          password: "${{ vars.REGISTRY_PASS }}"
+
+      - name: Create torsearch-worker docker image
+        run: |
+          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 push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG}
+          docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker:latest
+
+  build-base-worker-supervisord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: "${{ vars.REGISTRY_URL }}"
+          username: "${{ vars.REGISTRY_USER }}"
+          password: "${{ vars.REGISTRY_PASS }}"
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          build-args:
+            ALPINE_VERSION: 3.22
+          push: true
+          file: docker/Dockerfile.base.worker
+          platforms: linux/amd64
+          tags: |
+            code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
+
+#      - name: Create torsearch-scheduler docker image
+#        run: |
+#          docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
        run: composer global require phing/phing

      - name: Run composer
-        run: composer install --no-dev --no-scripts -o
+        run: composer install --no-dev --no-scripts --ignore-platform-reqs -o
  
      - name: Build tailwind
        run: APP_ENV=build php bin/console tailwind:build
@@ -45,7 +45,7 @@ jobs:
          tag="${{ gitea.REF_NAME }}"
          tmdb_api="${{ vars.TMDB_API }}"
          version=${tag:1}
-          docker build -f docker/Dockerfile.app \
+          docker build --pull -f docker/Dockerfile.app \
            -t code.caldwell.digital/home/torsearch-app:${version} \
            -t code.caldwell.digital/home/torsearch-app:latest \
            --build-arg "APP_VERSION=${version}" \
@@ -59,7 +59,7 @@ jobs:
          tag="${{ gitea.REF_NAME }}"
          tmdb_api="${{ vars.TMDB_API }}"
          version=${tag:1}
-          docker build -f docker/Dockerfile.worker \
+          docker build --pull -f docker/Dockerfile.worker \
            -t code.caldwell.digital/home/torsearch-worker:${version} \
            -t code.caldwell.digital/home/torsearch-worker:latest \
            --build-arg "APP_VERSION=${version}" \
@@ -73,7 +73,7 @@ jobs:
          tag="${{ gitea.REF_NAME }}"
          tmdb_api="${{ vars.TMDB_API }}"
          version=${tag:1}
-          docker build -f docker/Dockerfile.scheduler \
+          docker build --pull -f docker/Dockerfile.scheduler \
            -t code.caldwell.digital/home/torsearch-scheduler:${version} \
            -t code.caldwell.digital/home/torsearch-scheduler:latest \
            --build-arg "APP_VERSION=${version}" \
--- a/bash/build_base.sh
+++ b/bash/build_base.sh
@@ -1,22 +1,19 @@
 # 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 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
+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 push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG}
+docker push --platform=linux/amd64 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 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
+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 push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG}
+docker push --platform=linux/amd64 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
+docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
+docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
--- a/compose.yml
+++ b/compose.yml
@@ -27,8 +27,8 @@ services:
    tty: true
    environment:
      TZ: America/Chicago
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_PUBLISHER_JWT_KEY: "${MERCURE_PUBLISHER_JWT_KEY}"
+      MERCURE_SUBSCRIBER_JWT_KEY: "${MERCURE_SUBSCRIBER_JWT_KEY}"
    depends_on:
      database:
        condition: service_healthy
--- a/docker/Dockerfile.base.worker
+++ b/docker/Dockerfile.base.worker
@@ -16,11 +16,13 @@ RUN apk add --no-cache \
  php84-fileinfo \
  php84-fpm \
  php84-gd \
+  php84-intl \
  php84-mbstring \
  php84-mysqli \
  php84-opcache \
  php84-openssl \
  php84-pdo_mysql \
+  php84-session \
  php84-tokenizer \
  php84-xml \
  supervisor
--- a/docker/Dockerfile.scheduler
+++ b/docker/Dockerfile.scheduler
@@ -15,6 +15,7 @@ FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
 FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest

 # Set the APP_VERSION in the image
+ARG APP_VERSION="latest"
 ENV APP_VERSION=${APP_VERSION}

 ARG TMDB_API=""
--- a/docker/Dockerfile.worker
+++ b/docker/Dockerfile.worker
@@ -15,6 +15,7 @@ FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
 FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest

 # Set the APP_VERSION in the image
+ARG APP_VERSION="latest"
 ENV APP_VERSION=${APP_VERSION}

 ARG TMDB_API=""
Author	SHA1	Message	Date
Brock H Caldwell	a6d5e2b026	task(ci): update base image	2026-03-10 23:58:47 -05:00
Brock H Caldwell	688ea98922	task(ci): update base image	2026-03-10 23:57:11 -05:00
Brock H Caldwell	d55a9cfdd5	task(ci): update base image	2026-03-10 23:55:52 -05:00
Brock H Caldwell	e9021c22fa	task(ci): update base image Some checks failed CI / build-base-worker (push) Successful in 53s Details CI / build-base-worker-supervisord (push) Failing after 2m4s Details CI / build-base-app (push) Successful in 2m19s Details	2026-03-10 23:51:32 -05:00
Brock H Caldwell	939660a715	task(ci): build base images Some checks failed CI / build-base-worker (push) Failing after 32s Details CI / build-base-app (push) Successful in 40s Details CI / build-base-worker-supervisord (push) Failing after 2m19s Details	2026-03-10 23:48:12 -05:00
Brock H Caldwell	fb3e7b20ff	task(ci): build base images Some checks failed CI / build-base-worker (push) Failing after 35s Details CI / build-base-worker-supervisord (push) Successful in 50s Details CI / build-base-app (push) Successful in 3m1s Details	2026-03-10 23:09:20 -05:00
Brock H Caldwell	699dbaabc3	fix: build script, installs php exts to worker image All checks were successful CI / build-test (push) Successful in 3m8s Details	2026-03-10 20:22:53 -05:00
Brock H Caldwell	484ac40d99	fix: broken mercure	2026-03-10 20:21:27 -05:00
Brock H Caldwell	b8a22e63c9	WIP: CI docker All checks were successful CI / build-test (push) Successful in 3m15s Details	2026-03-09 15:20:41 -05:00
Brock H Caldwell	e489f73f7c	fix(ci): adds --ignore-platform-reqs to composer All checks were successful CI / build-test (push) Successful in 2m54s Details	2026-03-09 13:59:25 -05:00
Brock H Caldwell	554b7774f6	Update docker All checks were successful CI / build-test (push) Successful in 3m10s Details	2026-03-09 13:14:27 -05:00