[5.x] Correct tag prefix for the development branch (#99)

* [5.x] Correct tag prefix for the development branch * [5.x] Remove docker prune
shinsenter · Aug 8, 2024 · fdf4f09 · fdf4f09
1 parent 8f37666
commit fdf4f09
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/template-common.yml b/.github/workflows/template-common.yml
@@ -100,7 +100,6 @@ jobs:
         if: ${{ !env.SKIP_BUILD }}
         name: Cleanup before building ${{ env.BUILD_TAG }}
         run: |
-          docker system prune -a --volumes -f
           sudo swapoff -a || true
           sudo rm -f /mnt/swapfile || true
           free -h

diff --git a/src/php/with-apache.dockerfile b/src/php/with-apache.dockerfile
@@ -21,10 +21,12 @@ ARG  BUILDKIT_SBOM_SCAN_STAGE=true
 # FROM ./base-php AS php
 
 ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-shinsenter/php}
+ARG  BUILD_TAG_PREFIX=${BUILD_TAG_PREFIX:-}
+
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-fpm-alpine}
 
-FROM ${BUILD_FROM_IMAGE}:${PHP_VERSION}-${PHP_VARIANT}
+FROM ${BUILD_FROM_IMAGE}:${BUILD_TAG_PREFIX}${PHP_VERSION}-${PHP_VARIANT}
 ONBUILD RUN if has-cmd autorun; then autorun /etc/onbuild.d/; fi
 
 ################################################################################

diff --git a/src/php/with-f8p.dockerfile b/src/php/with-f8p.dockerfile
@@ -23,12 +23,14 @@ ARG  BUILDKIT_SBOM_SCAN_STAGE=true
 # FROM ./base-php AS php
 
 ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-shinsenter/php}
+ARG  BUILD_TAG_PREFIX=${BUILD_TAG_PREFIX:-}
+
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-zts-alpine}
 ARG  BUILD_SOURCE_IMAGE=${BUILD_SOURCE_IMAGE:-dunglas/frankenphp:1-php${PHP_VERSION}}
 
 FROM ${BUILD_SOURCE_IMAGE} AS frankenphp
-FROM ${BUILD_FROM_IMAGE}:${PHP_VERSION}-${PHP_VARIANT}
+FROM ${BUILD_FROM_IMAGE}:${BUILD_TAG_PREFIX}${PHP_VERSION}-${PHP_VARIANT}
 ONBUILD RUN if has-cmd autorun; then autorun /etc/onbuild.d/; fi
 
 ################################################################################

diff --git a/src/php/with-nginx.dockerfile b/src/php/with-nginx.dockerfile
@@ -21,10 +21,12 @@ ARG  BUILDKIT_SBOM_SCAN_STAGE=true
 # FROM ./base-php AS php
 
 ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-shinsenter/php}
+ARG  BUILD_TAG_PREFIX=${BUILD_TAG_PREFIX:-}
+
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-fpm-alpine}
 
-FROM ${BUILD_FROM_IMAGE}:${PHP_VERSION}-${PHP_VARIANT}
+FROM ${BUILD_FROM_IMAGE}:${BUILD_TAG_PREFIX}${PHP_VERSION}-${PHP_VARIANT}
 ONBUILD RUN if has-cmd autorun; then autorun /etc/onbuild.d/; fi
 
 ################################################################################

diff --git a/src/php/with-roadrunner.dockerfile b/src/php/with-roadrunner.dockerfile
@@ -21,10 +21,12 @@ ARG  BUILDKIT_SBOM_SCAN_STAGE=true
 # FROM ./base-php AS php
 
 ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-shinsenter/php}
+ARG  BUILD_TAG_PREFIX=${BUILD_TAG_PREFIX:-}
+
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-cli-alpine}
 
-FROM ${BUILD_FROM_IMAGE}:${PHP_VERSION}-${PHP_VARIANT}
+FROM ${BUILD_FROM_IMAGE}:${BUILD_TAG_PREFIX}${PHP_VERSION}-${PHP_VARIANT}
 ONBUILD RUN if has-cmd autorun; then autorun /etc/onbuild.d/; fi
 
 ################################################################################

diff --git a/src/php/with-unit.dockerfile b/src/php/with-unit.dockerfile
@@ -21,10 +21,12 @@ ARG  BUILDKIT_SBOM_SCAN_STAGE=true
 # FROM ./base-php AS php
 
 ARG  BUILD_FROM_IMAGE=${BUILD_FROM_IMAGE:-shinsenter/php}
+ARG  BUILD_TAG_PREFIX=${BUILD_TAG_PREFIX:-}
+
 ARG  PHP_VERSION=${PHP_VERSION:-8.3}
 ARG  PHP_VARIANT=${PHP_VARIANT:-zts-alpine}
 
-FROM ${BUILD_FROM_IMAGE}:${PHP_VERSION}-${PHP_VARIANT}
+FROM ${BUILD_FROM_IMAGE}:${BUILD_TAG_PREFIX}${PHP_VERSION}-${PHP_VARIANT}
 ONBUILD RUN if has-cmd autorun; then autorun /etc/onbuild.d/; fi
 
 ################################################################################