Skip to content

Commit e84da41

Browse files
bfrenbfren
authored
v7.0.0 (#273)
Major updates * Using latest base images * Switching to quay.io Minor updates * Using bf http download Build updates * Updating action workflows
1 parent 7448564 commit e84da41

18 files changed

Lines changed: 38 additions & 37 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: 7 additions & 7 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
@@ -49,12 +49,12 @@ jobs:
4949
username: ${{ secrets.DOCKERHUB_USERNAME }}
5050
password: ${{ secrets.DOCKERHUB_TOKEN }}
5151
-
52-
name: Login to GitHub Container Registry
52+
name: Login to Quay.io Container Registry
5353
uses: docker/login-action@v3
5454
with:
55-
registry: ghcr.io
55+
registry: quay.io
5656
username: ${{ github.repository_owner }}
57-
password: ${{ secrets.GITHUB_TOKEN }}
57+
password: ${{ secrets.QUAY_TOKEN }}
5858
-
5959
name: Build and export
6060
id: docker_export
@@ -87,9 +87,9 @@ jobs:
8787
bfren/wordpress:php${{ matrix.php }}-dev
8888
bfren/wordpress:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
8989
bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-dev
90-
ghcr.io/bfren/wordpress:php${{ matrix.php }}-dev
91-
ghcr.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
92-
ghcr.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-dev
90+
quay.io/bfren/wordpress:php${{ matrix.php }}-dev
91+
quay.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
92+
quay.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-dev
9393
-
9494
name: Image digest
9595
run: echo ${{ steps.docker_build.outputs.digest }}

‎.github/workflows/publish.yml‎

Lines changed: 13 additions & 13 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
@@ -69,12 +69,12 @@ jobs:
6969
username: ${{ secrets.DOCKERHUB_USERNAME }}
7070
password: ${{ secrets.DOCKERHUB_TOKEN }}
7171
-
72-
name: Login to GitHub Container Registry
72+
name: Login to Quay.io Container Registry
7373
uses: docker/login-action@v3
7474
with:
75-
registry: ghcr.io
75+
registry: quay.io
7676
username: ${{ github.repository_owner }}
77-
password: ${{ secrets.GITHUB_TOKEN }}
77+
password: ${{ secrets.QUAY_TOKEN }}
7878
-
7979
name: Build and push
8080
id: docker_build
@@ -98,15 +98,15 @@ jobs:
9898
bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}
9999
bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-${{ steps.version.outputs.contents }}
100100
bfren/wordpress:php${{ steps.php_revision.outputs.contents }}
101-
ghcr.io/bfren/wordpress:php${{ matrix.php }}
102-
ghcr.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }}
103-
ghcr.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }}
104-
ghcr.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
105-
ghcr.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_minor.outputs.contents }}
106-
ghcr.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
107-
ghcr.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}
108-
ghcr.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-${{ steps.version.outputs.contents }}
109-
ghcr.io/bfren/wordpress:php${{ steps.php_revision.outputs.contents }}
101+
quay.io/bfren/wordpress:php${{ matrix.php }}
102+
quay.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }}
103+
quay.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }}
104+
quay.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
105+
quay.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_minor.outputs.contents }}
106+
quay.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
107+
quay.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}
108+
quay.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-${{ steps.version.outputs.contents }}
109+
quay.io/bfren/wordpress:php${{ steps.php_revision.outputs.contents }}
110110
-
111111
name: Image digest
112112
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/nginx-php:php<%= ${PHP_REVISION} %>-<%= ${BASE_VERSION} %>
1+
FROM quay.io/bfren/nginx-php:php<%= ${PHP_REVISION} %>-<%= ${BASE_VERSION} %>
22

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

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.5.7
1+
7.0.0

‎VERSION_MAJOR‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6
1+
7

‎VERSION_MINOR‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.5
1+
7.0

‎generate-dockerfiles.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44

55
docker pull bfren/alpine
66

7-
BASE_VERSION="7.5.3"
7+
BASE_VERSION="8.0.1"
88
echo "Base: ${BASE_VERSION}"
99

1010
PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4"

‎overlay/etc/nu/scripts/bf-wordpress/conf.nu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export def get_salt [
4343
if ($file | bf fs is_not_file) {
4444
let url = "https://api.wordpress.org/secret-key/1.1/salt/"
4545
bf write $"Downloading fresh authentication secrets from ($url)." conf/get_salt
46-
http get --raw $url | save --force $file
46+
bf http download $url $file
4747
} else {
4848
bf write $"Reading authentication secrets from ($file)." conf/get_salt
4949
}

0 commit comments

Comments
 (0)