Skip to content

Commit 780ad2b

Browse files
bfrenbfren
authored
v5.0.0 (#106)
Major updates * Using latest base images Build updates * Updating workflow action versions * Switching to use quay.io
1 parent f061f35 commit 780ad2b

17 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎.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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
-
2222
name: Checkout code
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
-
2525
name: Get repository name
2626
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -50,12 +50,12 @@ jobs:
5050
username: ${{ secrets.DOCKERHUB_USERNAME }}
5151
password: ${{ secrets.DOCKERHUB_TOKEN }}
5252
-
53-
name: Login to GitHub Container Registry
53+
name: Login to Quay.io Container Registry
5454
uses: docker/login-action@v3
5555
with:
56-
registry: ghcr.io
56+
registry: quay.io
5757
username: ${{ github.repository_owner }}
58-
password: ${{ secrets.GITHUB_TOKEN }}
58+
password: ${{ secrets.QUAY_TOKEN }}
5959
-
6060
name: Build and export
6161
id: docker_export
@@ -87,8 +87,8 @@ jobs:
8787
tags: |
8888
bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-dev
8989
bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }}-dev
90-
ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-dev
91-
ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }}-dev
90+
quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-dev
91+
quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }}-dev
9292
-
9393
name: Build and push default
9494
id: docker_build_default
@@ -105,8 +105,8 @@ jobs:
105105
tags: |
106106
bfren/apache:dev
107107
bfren/apache:${{ steps.version.outputs.contents }}-dev
108-
ghcr.io/bfren/apache:dev
109-
ghcr.io/bfren/apache:${{ steps.version.outputs.contents }}-dev
108+
quay.io/bfren/apache:dev
109+
quay.io/bfren/apache:${{ steps.version.outputs.contents }}-dev
110110
-
111111
name: Image digest
112112
run: echo ${{ steps.docker_build.outputs.digest }}

‎.github/workflows/publish.yml‎

Lines changed: 12 additions & 12 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
@@ -81,10 +81,10 @@ jobs:
8181
bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_major.outputs.contents }}
8282
bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_minor.outputs.contents }}
8383
bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }}
84-
ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}
85-
ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_major.outputs.contents }}
86-
ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_minor.outputs.contents }}
87-
ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }}
84+
quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}
85+
quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_major.outputs.contents }}
86+
quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_minor.outputs.contents }}
87+
quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }}
8888
-
8989
name: Build and push default
9090
id: docker_build_default
@@ -104,10 +104,10 @@ jobs:
104104
bfren/apache:${{ steps.version_major.outputs.contents }}
105105
bfren/apache:${{ steps.version_minor.outputs.contents }}
106106
bfren/apache:${{ steps.version.outputs.contents }}
107-
ghcr.io/bfren/apache:latest
108-
ghcr.io/bfren/apache:${{ steps.version_major.outputs.contents }}
109-
ghcr.io/bfren/apache:${{ steps.version_minor.outputs.contents }}
110-
ghcr.io/bfren/apache:${{ steps.version.outputs.contents }}
107+
quay.io/bfren/apache:latest
108+
quay.io/bfren/apache:${{ steps.version_major.outputs.contents }}
109+
quay.io/bfren/apache:${{ steps.version_minor.outputs.contents }}
110+
quay.io/bfren/apache:${{ steps.version.outputs.contents }}
111111
-
112112
name: Image digest
113113
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

‎Dockerfile.esh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %>
1+
FROM quay.io/bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %>
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"
44

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.3.10
1+
5.0.0

‎VERSION_MAJOR‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4
1+
5

‎VERSION_MINOR‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.3
1+
5.0

‎alpine3.15/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.6.7
1+
FROM quay.io/bfren/alpine-s6:alpine3.15-6.0.0
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"
44

‎alpine3.16/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.6.7
1+
FROM quay.io/bfren/alpine-s6:alpine3.16-6.0.0
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache"
44

0 commit comments

Comments
 (0)