changed container image to only use php8.1

.github/workflows/container-base-image-release.yml

@@ -1,58 +0,0 @@
-name: Container Base Image Release
-concurrency: production
-on:
-  workflow_dispatch:
-jobs:
-  release-base-image:
-    runs-on: ubuntu-latest
-    name: Release base container image
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up qemu
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up docker buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          platforms: linux/amd64,linux/arm64
-
-      - name: Read metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ghcr.io/jikan-me/jikan-rest-php
-            jikanme/jikan-rest-php
-          tags: |
-            type=sha
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          context: ./docker/base_image/php-8.1
-          # let's use github action cache storage
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          build-args: |
-            GITHUB_PERSONAL_TOKEN=${{ secrets.GITHUB_TOKEN }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,6 +1,18 @@
-ARG BASE_IMAGE_VERSION="8.1-latest"
+FROM spiralscout/roadrunner:2.12.2 as roadrunner
-FROM jikanme/jikan-rest-php:${BASE_IMAGE_VERSION}
+FROM composer:2.5.1 as composer
+FROM mlocati/php-extension-installer:1.5.52 as php-ext-installer
+FROM php:8.1.16-bullseye
 ARG GITHUB_PERSONAL_TOKEN
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+COPY --from=php-ext-installer /usr/bin/install-php-extensions /usr/local/bin/
+ENV COMPOSER_HOME="/tmp/composer"
+RUN set -x \
+    && install-php-extensions gd exif intl bz2 gettext mongodb-stable redis opcache sockets pcntl \
+    # install xdebug (for testing with code coverage), but do not enable it
+    && IPE_DONT_ENABLE=1 install-php-extensions xdebug-3.2.0
+
+# install roadrunner
+COPY --from=roadrunner /usr/bin/rr /usr/bin/rr
 LABEL org.opencontainers.image.source=https://github.com/jikan-me/jikan-rest
 RUN	set -ex \
     && apt-get update && apt-get install -y --no-install-recommends \

docker/base_image/php-8.0/Dockerfile

@@ -1,13 +0,0 @@
-FROM spiralscout/roadrunner:2.10.6 as roadrunner
-FROM composer:2.3.9 as composer
-FROM mlocati/php-extension-installer:1.5.29 as php-ext-installer
-FROM php:8.0-bullseye as runtime
-ARG GITHUB_PERSONAL_TOKEN
-LABEL org.opencontainers.image.source=https://github.com/jikan-me/jikan-rest/docker/base_image/php-8.0
-COPY --from=composer /usr/bin/composer /usr/bin/composer
-COPY --from=php-ext-installer /usr/bin/install-php-extensions /usr/local/bin/
-ENV COMPOSER_HOME="/tmp/composer"
-RUN install-php-extensions gd exif intl bz2 gettext mongodb-stable redis opcache sockets pcntl
-
-# install roadrunner
-COPY --from=roadrunner /usr/bin/rr /usr/bin/rr

docker/base_image/php-8.0/readme.md

@@ -1,3 +0,0 @@
-# Jikan Rest Base image
-
-The base image for Jikan REST app, to speed up container builds. This is mostly for internal use.

docker/base_image/php-8.1/Dockerfile

@@ -1,16 +0,0 @@
-FROM spiralscout/roadrunner:2.12.2 as roadrunner
-FROM composer:2.5.1 as composer
-FROM mlocati/php-extension-installer:1.5.52 as php-ext-installer
-FROM php:8.1.13-bullseye as runtime
-ARG GITHUB_PERSONAL_TOKEN
-LABEL org.opencontainers.image.source=https://github.com/jikan-me/jikan-rest/docker/base_image/php-8.1
-COPY --from=composer /usr/bin/composer /usr/bin/composer
-COPY --from=php-ext-installer /usr/bin/install-php-extensions /usr/local/bin/
-ENV COMPOSER_HOME="/tmp/composer"
-RUN set -x \
-    && install-php-extensions gd exif intl bz2 gettext mongodb-stable redis opcache sockets pcntl \
-    # install xdebug (for testing with code coverage), but do not enable it
-    && IPE_DONT_ENABLE=1 install-php-extensions xdebug-3.2.0
-
-# install roadrunner
-COPY --from=roadrunner /usr/bin/rr /usr/bin/rr