diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 0d434ac..61886a1 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout Branch ${{ github.ref_name }} - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Create Pull Request run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}." diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index c541219..664b6e4 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -32,19 +32,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -52,7 +52,7 @@ jobs: - name: Build and export id: docker_export - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: file: ./${{ matrix.php }}/Dockerfile build-args: | @@ -68,7 +68,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./${{ matrix.php }}/Dockerfile diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8049bed..27c2f3b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -46,19 +46,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -66,7 +66,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./${{ matrix.php }}/Dockerfile diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 7153006..31e6472 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -15,10 +15,10 @@ jobs: shell: bash - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 0869d83..c999087 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 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.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.2.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 583e456..648517c 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 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.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.2.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 462db3d..2262328 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 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.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.2.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 f8c6342..c8ce0d2 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 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.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.2.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 b2ea199..1f0627a 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 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.30-alpine3.24-7.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.30-alpine3.24-7.2.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 b3bae79..2d1ab92 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 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.30-alpine3.24-7.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.30-alpine3.24-7.2.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 4fe4aff..18080cc 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.13 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.15 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.30-alpine3.24-7.2.0 AS final +FROM quay.io/bfren/nginx:nginx1.30-alpine3.24-7.2.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 797ed2e..6c96164 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.2.1 \ No newline at end of file +8.2.2 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index a4906ff..d4e59a3 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,8 +4,8 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="7.2.0" -PHP_BRANCH="v3.1.13" +BASE_VERSION="7.2.1" +PHP_BRANCH="v3.1.15" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do