diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 4e5b4a9..7153006 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -24,7 +24,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Update repo description with README.md - uses: peter-evans/dockerhub-description@v3 + uses: peter-evans/dockerhub-description@v5 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/workflow-cleanup.yml b/.github/workflows/workflow-cleanup.yml index 36fcf4f..3bcccd8 100644 --- a/.github/workflows/workflow-cleanup.yml +++ b/.github/workflows/workflow-cleanup.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Delete old workflow runs - uses: bfren/delete-workflow-runs@main + uses: bfren/delete-workflow-runs@v2 with: token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.repository }} diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 49e9b70..d286708 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 v3.1.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.1 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 quay.io/bfren/nginx:nginx1.20-alpine3.15-7.1.0 AS final +FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.1.1 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 ce10ef8..4b47bc0 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 v3.1.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.1 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 quay.io/bfren/nginx:nginx1.22-alpine3.16-7.1.0 AS final +FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.1.1 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 9902829..ed4bc87 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 v3.1.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.1 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 quay.io/bfren/nginx:nginx1.24-alpine3.19-7.1.0 AS final +FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.1.1 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 59ffb97..739fcfd 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 v3.1.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.1 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 quay.io/bfren/nginx:nginx1.28-alpine3.22-7.1.0 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.1.1 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 1da336d..1e5d347 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 v3.1.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.1 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 quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.0 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.1 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.4/Dockerfile b/8.4/Dockerfile index b7c41bc..3ac98c1 100644 --- a/8.4/Dockerfile +++ b/8.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 v3.1.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.1 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 quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.0 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.1 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.5/Dockerfile b/8.5/Dockerfile index 6119a0e..5ad8140 100644 --- a/8.5/Dockerfile +++ b/8.5/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 v3.1.0 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.1 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 quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.0 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.1 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/VERSION b/VERSION index da15618..42ed2d7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.1.0 \ No newline at end of file +8.1.1 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 300e353..1192eb4 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="7.1.0" -PHP_BRANCH="v3.1.0" +BASE_VERSION="7.1.1" +PHP_BRANCH="v3.1.1" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do