Removed obsolete PHP 8.0 versions

ckulka · Jan 27, 2024 · 2e1c6fb · 2e1c6fb
1 parent 34ac0f8
commit 2e1c6fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 186 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -55,8 +55,9 @@ jobs:
 
       # Get the release version by stripping build metadata from the release name
       - name: Parse release tag
+        id: parse-release-tag
         if: github.event_name == 'release'
-        run: echo DOCKER_RELEASE_TAG=${GITHUB_REF_NAME/+*/} >> $GITHUB_ENV
+        run: echo tag=${GITHUB_REF_NAME/+*/} >> "$GITHUB_OUTPUT"
 
       - name: Build and push release image
         if: github.event_name == 'release'
@@ -66,65 +67,11 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/386
           push: true
           tags: |
-            ckulka/baikal:${{ env.DOCKER_RELEASE_TAG }}-apache
-            ckulka/baikal:${{ env.DOCKER_RELEASE_TAG }}
+            ckulka/baikal:${{ steps.parse-release-tag.outputs.tag }}-apache
+            ckulka/baikal:${{ steps.parse-release-tag.outputs.tag }}
             ckulka/baikal:apache
             ckulka/baikal:latest
 
-  build_apache_php80:
-    name: Build Apache variant (PHP 8.0)
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          show-progress: false
-
-      # See https://github.com/docker/setup-qemu-action
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      # See https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      # See https://github.com/docker/login-action
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      # Build Apache httpd images
-      - name: Build and push experimental image
-        if: github.event_name == 'push'
-        uses: docker/build-push-action@v2
-        with:
-          file: apache-php8.0.dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/386
-          push: true
-          tags: |
-            ckulka/baikal:experimental-apache-php8.0
-            ckulka/baikal:experimental-php8.0
-
-      # Get the release version by stripping build metadata from the release name
-      - name: Parse release tag
-        if: github.event_name == 'release'
-        run: echo DOCKER_RELEASE_TAG=${GITHUB_REF_NAME/+*/} >> $GITHUB_ENV
-
-      - name: Build and push release image
-        if: github.event_name == 'release'
-        uses: docker/build-push-action@v2
-        with:
-          file: apache-php8.0.dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/386
-          push: true
-          tags: |
-            ckulka/baikal:${{ env.DOCKER_RELEASE_TAG }}-apache-php8.0
-            ckulka/baikal:${{ env.DOCKER_RELEASE_TAG }}-php8.0
-            ckulka/baikal:apache-php8.0
-            ckulka/baikal:latest-php8.0
-
   build_nginx:
     name: Build nginx variant
     runs-on: ubuntu-latest
@@ -161,8 +108,9 @@ jobs:
 
       # Get the release version by stripping build metadata from the release name
       - name: Parse release tag
+        id: parse-release-tag
         if: github.event_name == 'release'
-        run: echo DOCKER_RELEASE_TAG=${GITHUB_REF_NAME/+*/} >> $GITHUB_ENV
+        run: echo tag=${GITHUB_REF_NAME/+*/} >> "$GITHUB_OUTPUT"
 
       - name: Build and push release image
         if: github.event_name == 'release'
@@ -172,51 +120,5 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/386
           push: true
           tags: |
-            ckulka/baikal:${{ env.DOCKER_RELEASE_TAG }}-nginx
+            ckulka/baikal:${{ steps.parse-release-tag.outputs.tag }}-nginx
             ckulka/baikal:nginx
-
-  build_nginx_php80:
-    name: Build nginx variant (PHP 8.0)
-    runs-on: ubuntu-latest
-
-    steps:
-      # See https://github.com/docker/setup-qemu-action
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      # See https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # See https://github.com/docker/login-action
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      # Build nginx images
-      - name: Build and push experimental image
-        if: github.event_name == 'push'
-        uses: docker/build-push-action@v5
-        with:
-          file: nginx-php8.0.dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/386
-          push: true
-          tags: ckulka/baikal:experimental-nginx-php8.0
-
-      # Get the release version by stripping build metadata from the release name
-      - name: Parse release tag
-        if: github.event_name == 'release'
-        run: echo DOCKER_RELEASE_TAG=${GITHUB_REF_NAME/+*/} >> $GITHUB_ENV
-
-      - name: Build and push release image
-        if: github.event_name == 'release'
-        uses: docker/build-push-action@v2
-        with:
-          file: nginx-php8.0.dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/386
-          push: true
-          tags: |
-            ckulka/baikal:${{ env.DOCKER_RELEASE_TAG }}-nginx-php8.0
-            ckulka/baikal:nginx-php8.0
diff --git a/apache-php8.0.dockerfile b/apache-php8.0.dockerfile
diff --git a/nginx-php8.0.dockerfile b/nginx-php8.0.dockerfile