Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}."
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,27 +32,27 @@ 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 }}
password: ${{ secrets.QUAY_TOKEN }}
-
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: |
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -46,27 +46,27 @@ 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 }}
password: ${{ secrets.QUAY_TOKEN }}
-
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions 7.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions 8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions 8.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions 8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions 8.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions 8.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions 8.5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.2.1
8.2.2
4 changes: 2 additions & 2 deletions generate-dockerfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down