From 44f86b5001ffff922d0324cb49eab4723b6a17fe Mon Sep 17 00:00:00 2001 From: bfren Date: Tue, 30 Jul 2024 16:10:53 +0100 Subject: [PATCH 1/3] Bumping version to 7.2.15 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f66fd22..c37fb2a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.14 \ No newline at end of file +7.2.15 \ No newline at end of file From 1333ec45083e118fbd21850e51b2d5f67b794d42 Mon Sep 17 00:00:00 2001 From: bfren Date: Tue, 30 Jul 2024 16:11:36 +0100 Subject: [PATCH 2/3] Updating workflows --- .github/workflows/dev.yml | 4 ++-- .github/workflows/publish.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 635ae77..1287ab7 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -52,7 +52,7 @@ jobs: - name: Build and export id: docker_export - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: file: ./${{ matrix.php }}/Dockerfile build-args: | @@ -68,7 +68,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./${{ matrix.php }}/Dockerfile diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 813a9a6..c63bb09 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -66,7 +66,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./${{ matrix.php }}/Dockerfile From a961de07d4caa9fef83e6ab7bbdff19295679d60 Mon Sep 17 00:00:00 2001 From: bfren Date: Tue, 30 Jul 2024 16:11:56 +0100 Subject: [PATCH 3/3] Using latest base images --- 7.4/Dockerfile | 4 ++-- 8.0/Dockerfile | 4 ++-- 8.1/Dockerfile | 4 ++-- 8.2/Dockerfile | 4 ++-- 8.3/Dockerfile | 4 ++-- generate-dockerfiles.sh | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index cbd53d5..aabee80 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.2.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.2.12 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.3.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.3.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.0/Dockerfile b/8.0/Dockerfile index f598600..161bc12 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.2.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.2.12 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.3.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.3.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 099f9af..1c682b4 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.2.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.2.12 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.3.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.3.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.2/Dockerfile b/8.2/Dockerfile index db77176..9913bb5 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.2.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.2.12 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.20-6.3.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.20-6.3.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 80ac7d1..47287ef 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /tmp RUN \ # get the Nu scripts from the PHP image overlay echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v2.2.11 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v2.2.12 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ @@ -17,7 +17,7 @@ RUN \ # STAGE 1: create final image #====================================================================================================================== -FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.20-6.3.6 AS final +FROM ghcr.io/bfren/nginx:nginx1.26-alpine3.20-6.3.7 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 10c3b58..cd730ad 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.3.6" -PHP_BRANCH="v2.2.11" +BASE_VERSION="6.3.7" +PHP_BRANCH="v2.2.12" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3" for V in ${PHP_VERSIONS} ; do