From 1f9f1257489f7620a3133fa481f1b89d7145c2e5 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:51:41 +0000 Subject: [PATCH 1/7] Bumping version to 6.5.8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c7ed20f..22b6003 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.5.7 \ No newline at end of file +6.5.8 \ No newline at end of file From eede4acee2dfbb32d14812b8a2aff5ada6215234 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:51:59 +0000 Subject: [PATCH 2/7] Bumping version to 7.0.0 --- VERSION | 2 +- VERSION_MAJOR | 2 +- VERSION_MINOR | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 22b6003..4122521 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.5.8 \ No newline at end of file +7.0.0 \ No newline at end of file diff --git a/VERSION_MAJOR b/VERSION_MAJOR index 62f9457..c793025 100644 --- a/VERSION_MAJOR +++ b/VERSION_MAJOR @@ -1 +1 @@ -6 \ No newline at end of file +7 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 69c9391..7104585 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -6.5 \ No newline at end of file +7.0 \ No newline at end of file From bcb72c756b4f8ae5be9f766bdacebf9f3bf65f70 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:52:05 +0000 Subject: [PATCH 3/7] Updating action workflows --- .github/workflows/auto-pr.yml | 2 +- .github/workflows/dev.yml | 14 +++++++------- .github/workflows/publish.yml | 26 +++++++++++++------------- .github/workflows/update-readme.yml | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 54c3776..0d434ac 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -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 }}." diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index be77d84..ff50e2b 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -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 @@ -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 @@ -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 }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 62423c5..8757f3d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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 @@ -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 @@ -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 }} diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 7fc7506..4e5b4a9 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -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 From 4f257e544dddcb37d48bca866a82a5d2d92724b8 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:52:14 +0000 Subject: [PATCH 4/7] Switching to quay.io --- Dockerfile.esh | 2 +- php7.4/Dockerfile | 2 +- php8.0/Dockerfile | 2 +- php8.1/Dockerfile | 2 +- php8.2/Dockerfile | 2 +- php8.3/Dockerfile | 2 +- php8.4/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile.esh b/Dockerfile.esh index 993c1a7..d51b65a 100644 --- a/Dockerfile.esh +++ b/Dockerfile.esh @@ -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" diff --git a/php7.4/Dockerfile b/php7.4/Dockerfile index d2c46a5..0ba886c 100644 --- a/php7.4/Dockerfile +++ b/php7.4/Dockerfile @@ -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-7.5.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.0/Dockerfile b/php8.0/Dockerfile index f7d60ab..de8ab3d 100644 --- a/php8.0/Dockerfile +++ b/php8.0/Dockerfile @@ -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-7.5.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.1/Dockerfile b/php8.1/Dockerfile index c9da5b4..07e85b5 100644 --- a/php8.1/Dockerfile +++ b/php8.1/Dockerfile @@ -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-7.5.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.2/Dockerfile b/php8.2/Dockerfile index 5ee9fe4..6a27990 100644 --- a/php8.2/Dockerfile +++ b/php8.2/Dockerfile @@ -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-7.5.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.3/Dockerfile b/php8.3/Dockerfile index 7767ae8..0bb9789 100644 --- a/php8.3/Dockerfile +++ b/php8.3/Dockerfile @@ -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-7.5.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.4/Dockerfile b/php8.4/Dockerfile index 73a76df..430cbf6 100644 --- a/php8.4/Dockerfile +++ b/php8.4/Dockerfile @@ -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-7.5.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" From 8ab0e9ca4e51e14e70c1ee8cd83f473f7fdc86e1 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:52:27 +0000 Subject: [PATCH 5/7] Using bf http download --- overlay/etc/nu/scripts/bf-wordpress/conf.nu | 2 +- overlay/etc/nu/scripts/bf-wordpress/plugin.nu | 2 +- overlay/tmp/install | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/overlay/etc/nu/scripts/bf-wordpress/conf.nu b/overlay/etc/nu/scripts/bf-wordpress/conf.nu index 9cc9c46..aafafab 100644 --- a/overlay/etc/nu/scripts/bf-wordpress/conf.nu +++ b/overlay/etc/nu/scripts/bf-wordpress/conf.nu @@ -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 } diff --git a/overlay/etc/nu/scripts/bf-wordpress/plugin.nu b/overlay/etc/nu/scripts/bf-wordpress/plugin.nu index 42c0eb8..5ef2baf 100644 --- a/overlay/etc/nu/scripts/bf-wordpress/plugin.nu +++ b/overlay/etc/nu/scripts/bf-wordpress/plugin.nu @@ -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 diff --git a/overlay/tmp/install b/overlay/tmp/install index 4e31cc1..2b07b4c 100644 --- a/overlay/tmp/install +++ b/overlay/tmp/install @@ -49,13 +49,13 @@ def install_source [] { bf write debug $"WordPress download url: ($url)." install_source # get source download hash - let hash = http get --raw $"($url).sha1" + let hash = bf http download $"($url).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 From 3b7da224efb211e26a5c06a674cc6096bf795ac8 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:52:49 +0000 Subject: [PATCH 6/7] Using latest base images --- generate-dockerfiles.sh | 2 +- php7.4/Dockerfile | 2 +- php8.0/Dockerfile | 2 +- php8.1/Dockerfile | 2 +- php8.2/Dockerfile | 2 +- php8.3/Dockerfile | 2 +- php8.4/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index a5ee123..6db801a 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -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" diff --git a/php7.4/Dockerfile b/php7.4/Dockerfile index 0ba886c..d7b8cef 100644 --- a/php7.4/Dockerfile +++ b/php7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.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" diff --git a/php8.0/Dockerfile b/php8.0/Dockerfile index de8ab3d..feedd14 100644 --- a/php8.0/Dockerfile +++ b/php8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.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" diff --git a/php8.1/Dockerfile b/php8.1/Dockerfile index 07e85b5..bdba7b7 100644 --- a/php8.1/Dockerfile +++ b/php8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.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" diff --git a/php8.2/Dockerfile b/php8.2/Dockerfile index 6a27990..6b366ee 100644 --- a/php8.2/Dockerfile +++ b/php8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.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" diff --git a/php8.3/Dockerfile b/php8.3/Dockerfile index 0bb9789..6455308 100644 --- a/php8.3/Dockerfile +++ b/php8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.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" diff --git a/php8.4/Dockerfile b/php8.4/Dockerfile index 430cbf6..6edb092 100644 --- a/php8.4/Dockerfile +++ b/php8.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.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" From 9336baa3926a1aef46927c04441ab0a43645b754 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 13:08:03 +0000 Subject: [PATCH 7/7] Get sha1 after download --- overlay/tmp/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/overlay/tmp/install b/overlay/tmp/install index 2b07b4c..0b36912 100644 --- a/overlay/tmp/install +++ b/overlay/tmp/install @@ -49,7 +49,8 @@ def install_source [] { bf write debug $"WordPress download url: ($url)." install_source # get source download hash - let hash = bf http download $"($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