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@v4
uses: actions/checkout@v6
-
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@v4
uses: actions/checkout@v6
-
name: Get repository name
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
Expand Down Expand Up @@ -49,12 +49,12 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to GitHub Container Registry
name: Login to Quay.io Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
registry: quay.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
password: ${{ secrets.QUAY_TOKEN }}
-
name: Build and export
id: docker_export
Expand Down Expand Up @@ -87,9 +87,9 @@ jobs:
bfren/wordpress:php${{ matrix.php }}-dev
bfren/wordpress:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-dev
ghcr.io/bfren/wordpress:php${{ matrix.php }}-dev
ghcr.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
ghcr.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-dev
quay.io/bfren/wordpress:php${{ matrix.php }}-dev
quay.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
quay.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-dev
-
name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
26 changes: 13 additions & 13 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@v4
uses: actions/checkout@v6
-
name: Get repository name
run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
Expand Down Expand Up @@ -69,12 +69,12 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Login to GitHub Container Registry
name: Login to Quay.io Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
registry: quay.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
password: ${{ secrets.QUAY_TOKEN }}
-
name: Build and push
id: docker_build
Expand All @@ -98,15 +98,15 @@ jobs:
bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}
bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-${{ steps.version.outputs.contents }}
bfren/wordpress:php${{ steps.php_revision.outputs.contents }}
ghcr.io/bfren/wordpress:php${{ matrix.php }}
ghcr.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }}
ghcr.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }}
ghcr.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
ghcr.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_minor.outputs.contents }}
ghcr.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
ghcr.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}
ghcr.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-${{ steps.version.outputs.contents }}
ghcr.io/bfren/wordpress:php${{ steps.php_revision.outputs.contents }}
quay.io/bfren/wordpress:php${{ matrix.php }}
quay.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }}
quay.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }}
quay.io/bfren/wordpress:php${{ matrix.php }}-${{ steps.version.outputs.contents }}
quay.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_minor.outputs.contents }}
quay.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
quay.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}
quay.io/bfren/wordpress:php${{ matrix.php }}-wp${{ steps.wp_version.outputs.contents }}-${{ steps.version.outputs.contents }}
quay.io/bfren/wordpress:php${{ steps.php_revision.outputs.contents }}
-
name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
2 changes: 1 addition & 1 deletion .github/workflows/update-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
shell: bash
-
name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6
-
name: Login to DockerHub
uses: docker/login-action@v3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.esh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/nginx-php:php<%= ${PHP_REVISION} %>-<%= ${BASE_VERSION} %>
FROM quay.io/bfren/nginx-php:php<%= ${PHP_REVISION} %>-<%= ${BASE_VERSION} %>

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

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.7
7.0.0
2 changes: 1 addition & 1 deletion VERSION_MAJOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6
7
2 changes: 1 addition & 1 deletion VERSION_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5
7.0
2 changes: 1 addition & 1 deletion generate-dockerfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail

docker pull bfren/alpine

BASE_VERSION="7.5.3"
BASE_VERSION="8.0.1"
echo "Base: ${BASE_VERSION}"

PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4"
Expand Down
2 changes: 1 addition & 1 deletion overlay/etc/nu/scripts/bf-wordpress/conf.nu
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export def get_salt [
if ($file | bf fs is_not_file) {
let url = "https://api.wordpress.org/secret-key/1.1/salt/"
bf write $"Downloading fresh authentication secrets from ($url)." conf/get_salt
http get --raw $url | save --force $file
bf http download $url $file
} else {
bf write $"Reading authentication secrets from ($file)." conf/get_salt
}
Expand Down
2 changes: 1 addition & 1 deletion overlay/etc/nu/scripts/bf-wordpress/plugin.nu
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def install [
let name = $plugin_dir | path split | last
let tmp = $"/tmp/($name)"
let zip = $"($name).zip"
http get --raw $url | save $zip
bf http download $url $zip

# unzip files
bf write debug $" .. unzipping source download files to ($tmp)" plugin/install
Expand Down
5 changes: 3 additions & 2 deletions overlay/tmp/install
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,14 @@ def install_source [] {
bf write debug $"WordPress download url: ($url)." install_source

# get source download hash
let hash = http get --raw $"($url).sha1"
let sha1 = "wp.sha1"
let hash = bf http download $"($url).sha1" $sha1 | open --raw $sha1
bf write debug $"SHA1 hash for WordPress ($wp_version) [($wp_locale)]:(char newline)($hash)" install_source

# download source files to /tmp and verify checksum
bf write $"Downloading WordPress ($wp_version) [($wp_locale)]." install_source
let zip = "wp.zip"
http get --raw $url | save --progress $zip
bf http download $url $zip
$"($hash) ($zip)" | ^sha1sum -c -

# unzip files
Expand Down
2 changes: 1 addition & 1 deletion php7.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/nginx-php:php7.4.33-7.5.3
FROM quay.io/bfren/nginx-php:php7.4.33-8.0.1

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

Expand Down
2 changes: 1 addition & 1 deletion php8.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/nginx-php:php8.0.30-7.5.3
FROM quay.io/bfren/nginx-php:php8.0.30-8.0.1

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

Expand Down
2 changes: 1 addition & 1 deletion php8.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/nginx-php:php8.1.32-7.5.3
FROM quay.io/bfren/nginx-php:php8.1.32-8.0.1

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

Expand Down
2 changes: 1 addition & 1 deletion php8.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/nginx-php:php8.2.29-7.5.3
FROM quay.io/bfren/nginx-php:php8.2.29-8.0.1

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

Expand Down
2 changes: 1 addition & 1 deletion php8.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/nginx-php:php8.3.27-7.5.3
FROM quay.io/bfren/nginx-php:php8.3.27-8.0.1

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

Expand Down
2 changes: 1 addition & 1 deletion php8.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/nginx-php:php8.4.14-7.5.3
FROM quay.io/bfren/nginx-php:php8.4.14-8.0.1

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

Expand Down