Skip to content

Commit 2ae407b

Browse files
bfrenbfren
authored
v8.0.0 (#242)
Major updates * Using latest base images * Switching to use quay.io Build updates * Updating workflow action versions
1 parent 012fa8b commit 2ae407b

File tree

15 files changed

+43
-43
lines changed

15 files changed

+43
-43
lines changed

‎.github/workflows/auto-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
-
1212
name: Checkout Branch ${{ github.ref_name }}
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414
-
1515
name: Create Pull Request
1616
run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}."

‎.github/workflows/dev.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
-
2121
name: Checkout code
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323
-
2424
name: Get repository name
2525
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -43,12 +43,12 @@ jobs:
4343
username: ${{ secrets.DOCKERHUB_USERNAME }}
4444
password: ${{ secrets.DOCKERHUB_TOKEN }}
4545
-
46-
name: Login to GitHub Container Registry
46+
name: Login to Quay.io Container Registry
4747
uses: docker/login-action@v3
4848
with:
49-
registry: ghcr.io
49+
registry: quay.io
5050
username: ${{ github.repository_owner }}
51-
password: ${{ secrets.GITHUB_TOKEN }}
51+
password: ${{ secrets.QUAY_TOKEN }}
5252
-
5353
name: Build and export
5454
id: docker_export
@@ -80,8 +80,8 @@ jobs:
8080
tags: |
8181
bfren/nginx-php:php${{ matrix.php }}-dev
8282
bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
83-
ghcr.io/bfren/nginx-php:php${{ matrix.php }}-dev
84-
ghcr.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
83+
quay.io/bfren/nginx-php:php${{ matrix.php }}-dev
84+
quay.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
8585
-
8686
name: Image digest
8787
run: echo ${{ steps.docker_build.outputs.digest }}

‎.github/workflows/publish.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
-
1717
name: Checkout code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
-
2020
name: Get repository name
2121
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -57,12 +57,12 @@ jobs:
5757
username: ${{ secrets.DOCKERHUB_USERNAME }}
5858
password: ${{ secrets.DOCKERHUB_TOKEN }}
5959
-
60-
name: Login to GitHub Container Registry
60+
name: Login to Quay.io Container Registry
6161
uses: docker/login-action@v3
6262
with:
63-
registry: ghcr.io
63+
registry: quay.io
6464
username: ${{ github.repository_owner }}
65-
password: ${{ secrets.GITHUB_TOKEN }}
65+
password: ${{ secrets.QUAY_TOKEN }}
6666
-
6767
name: Build and push
6868
id: docker_build
@@ -83,12 +83,12 @@ jobs:
8383
bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
8484
bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}
8585
bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}-${{ steps.version.outputs.contents }}
86-
ghcr.io/bfren/nginx-php:php${{ matrix.php }}
87-
ghcr.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }}
88-
ghcr.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }}
89-
ghcr.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
90-
ghcr.io/bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}
91-
ghcr.io/bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}-${{ steps.version.outputs.contents }}
86+
quay.io/bfren/nginx-php:php${{ matrix.php }}
87+
quay.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }}
88+
quay.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }}
89+
quay.io/bfren/nginx-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
90+
quay.io/bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}
91+
quay.io/bfren/nginx-php:php${{ steps.php_revision.outputs.contents }}-${{ steps.version.outputs.contents }}
9292
-
9393
name: Image digest
9494
run: echo ${{ steps.docker_build.outputs.digest }}

‎.github/workflows/update-readme.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
shell: bash
1616
-
1717
name: Checkout code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
-
2020
name: Login to DockerHub
2121
uses: docker/login-action@v3

‎7.4/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# STAGE 0: get Nu scripts from the PHP image overlay
33
#======================================================================================================================
44

5-
FROM ghcr.io/bfren/alpine AS php
5+
FROM quay.io/bfren/alpine AS php
66

77
WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.4.7 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v3.0.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.7 AS final
20+
FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.0.0 AS final
2121
COPY --from=php /overlay /
2222

2323
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

‎8.0/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# STAGE 0: get Nu scripts from the PHP image overlay
33
#======================================================================================================================
44

5-
FROM ghcr.io/bfren/alpine AS php
5+
FROM quay.io/bfren/alpine AS php
66

77
WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.4.7 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v3.0.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.7 AS final
20+
FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.0.0 AS final
2121
COPY --from=php /overlay /
2222

2323
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

‎8.1/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# STAGE 0: get Nu scripts from the PHP image overlay
33
#======================================================================================================================
44

5-
FROM ghcr.io/bfren/alpine AS php
5+
FROM quay.io/bfren/alpine AS php
66

77
WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.4.7 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v3.0.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.7 AS final
20+
FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.0.0 AS final
2121
COPY --from=php /overlay /
2222

2323
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

‎8.2/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# STAGE 0: get Nu scripts from the PHP image overlay
33
#======================================================================================================================
44

5-
FROM ghcr.io/bfren/alpine AS php
5+
FROM quay.io/bfren/alpine AS php
66

77
WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.4.7 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v3.0.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final
20+
FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.0 AS final
2121
COPY --from=php /overlay /
2222

2323
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

‎8.3/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# STAGE 0: get Nu scripts from the PHP image overlay
33
#======================================================================================================================
44

5-
FROM ghcr.io/bfren/alpine AS php
5+
FROM quay.io/bfren/alpine AS php
66

77
WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.4.7 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v3.0.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final
20+
FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.0 AS final
2121
COPY --from=php /overlay /
2222

2323
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

‎8.4/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# STAGE 0: get Nu scripts from the PHP image overlay
33
#======================================================================================================================
44

5-
FROM ghcr.io/bfren/alpine AS php
5+
FROM quay.io/bfren/alpine AS php
66

77
WORKDIR /tmp
88
RUN \
99
# get the Nu scripts from the PHP image overlay
1010
echo "Cloning Alpine overlay." && \
11-
apk add git && git clone --branch v2.4.7 https://github.com/bfren/docker-php.git && \
11+
apk add git && git clone --branch v3.0.0 https://github.com/bfren/docker-php.git && \
1212
mkdir /overlay && \
1313
mv docker-php/overlay/etc /overlay/
1414

@@ -17,7 +17,7 @@ RUN \
1717
# STAGE 1: create final image
1818
#======================================================================================================================
1919

20-
FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 AS final
20+
FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.0 AS final
2121
COPY --from=php /overlay /
2222

2323
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"

0 commit comments

Comments
 (0)