Fixup?

.github/workflows/build.yml

@@ -45,27 +45,20 @@ jobs:
         env:
           runner: self-hosted
 
-      - name: "Setup: Setup QEMU"
-        uses: docker/setup-qemu-action@v3
+      - uses: benzine-framework/action-setup-docker@main
+        with:
+          ghcr_user: matthewbaggett
+          ghcr_token: ${{ secrets.GITHUB_TOKEN }}
+          docker_hub_user: matthewbaggett
+          docker_hub_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
-      - name: "Setup: Expose GitHub Runtime"
-        uses: crazy-max/ghaction-github-runtime@v3
-
-      - name: "Setup: Setup Docker Buildx"
-        uses: docker/setup-buildx-action@v3
-
-      - name: "Setup: Login to Docker Hub"
+      - name: "Setup: Login to Private Registry"
+        if: secrets.PRIVATE_REGISTRY
         uses: docker/login-action@v3
         with:
-          username: matthewbaggett
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-      - name: "Setup: Login to GHCR"
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: matthewbaggett
-          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: ${{ secrets.PRIVATE_REGISTRY_USER }}
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
 
       - name: "Setup: Checkout Source"
         uses: actions/checkout@v4
@@ -96,6 +89,7 @@ jobs:
           tags: |
             ghcr.io/benzine-framework/s3db:${{ matrix.database }}-${{ matrix.version }}
             benzine/s3db:${{ matrix.database }}-${{ matrix.version }}
+            ${{ secrets.PRIVATE_REGISTRY }}/s3db:${{ matrix.database }}-${{ matrix.version }}
           cache-from: ${{ !env.ACT && 'type=gha' || '' }}
           cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }}
           build-contexts: |

.gitignore

@@ -4,3 +4,4 @@
 /.minio
 /test.yml
 /.secrets
+/.github/cache

Dockerfile.mariadb

@@ -27,16 +27,16 @@ RUN echo "APT::Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
     add-apt-repository ppa:ondrej/php && \
     apt-get -qq update && \
     apt-get -yqq install --no-install-recommends \
-        #php8.1-apcu \
-        php8.1-bcmath \
-        #php8.1-bz2 \
-        php8.1-cli \
-        php8.1-curl \
-        php8.1-mysql \
-        #php8.1-opcache \
-        #php8.1-phpdbg \
-        php8.1-xml \
-        php8.1-zip \
+        #php8.3-apcu \
+        php8.3-bcmath \
+        #php8.3-bz2 \
+        php8.3-cli \
+        php8.3-curl \
+        php8.3-mysql \
+        #php8.3-opcache \
+        #php8.3-phpdbg \
+        php8.3-xml \
+        php8.3-zip \
         && \
     apt-get remove -yqq \
         software-properties-common \

Dockerfile.postgres

@@ -18,38 +18,38 @@ RUN apk add --no-cache runit && \
         nano \
         curl \
         tini \
-        php81 \
-        php81-dev \
-        php81-common \
-        php81-gd \
-        php81-xmlreader \
-        php81-bcmath \
-        php81-ctype \
-        php81-curl \
-        php81-exif \
-        php81-iconv \
-        php81-intl \
-        php81-mbstring \
-        php81-opcache \
-        php81-openssl \
-        php81-pcntl \
-        php81-phar \
-        php81-session \
-        php81-xml \
-        php81-xsl \
-        php81-zip \
-        php81-zlib \
-        php81-dom \
-        php81-fpm \
-        php81-sodium \
-        php81-tokenizer \
-        php81-fileinfo \
-        php81-simplexml \
+        php83 \
+        php83-dev \
+        php83-common \
+        php83-gd \
+        php83-xmlreader \
+        php83-bcmath \
+        php83-ctype \
+        php83-curl \
+        php83-exif \
+        php83-iconv \
+        php83-intl \
+        php83-mbstring \
+        php83-opcache \
+        php83-openssl \
+        php83-pcntl \
+        php83-phar \
+        php83-session \
+        php83-xml \
+        php83-xsl \
+        php83-zip \
+        php83-zlib \
+        php83-dom \
+        php83-fpm \
+        php83-sodium \
+        php83-tokenizer \
+        php83-fileinfo \
+        php83-simplexml \
         # Iconv Fix
-        php81-pecl-apcu \
+        php83-pecl-apcu \
         ncurses \
         xz \
-    && ln -sf /usr/bin/php81 /usr/bin/php
+    && ln -sf /usr/bin/php83 /usr/bin/php
 RUN curl https://getcomposer.org/composer-stable.phar --output /usr/local/bin/composer && \
     chmod +x /usr/local/bin/composer
 COPY start.sh /usr/local/bin/start.sh