diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 54c37760..0d434ac1 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 be77d84d..ff50e2be 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 62423c55..8757f3dd 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 7fc75067..4e5b4a9c 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 diff --git a/Dockerfile.esh b/Dockerfile.esh index 993c1a71..d51b65a9 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/VERSION b/VERSION index c7ed20f8..41225218 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.5.7 \ No newline at end of file +7.0.0 \ No newline at end of file diff --git a/VERSION_MAJOR b/VERSION_MAJOR index 62f94575..c7930257 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 69c93913..7104585f 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 diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index a5ee1235..6db801ad 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/overlay/etc/nu/scripts/bf-wordpress/conf.nu b/overlay/etc/nu/scripts/bf-wordpress/conf.nu index 9cc9c46e..aafafabe 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 42c0eb81..5ef2baf4 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 4e31cc14..0b369121 100644 --- a/overlay/tmp/install +++ b/overlay/tmp/install @@ -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 diff --git a/php7.4/Dockerfile b/php7.4/Dockerfile index d2c46a57..d7b8cef9 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-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 f7d60ab4..feedd143 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-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 c9da5b4e..bdba7b79 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-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 5ee9fe44..6b366eeb 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-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 7767ae8b..64553087 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-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 73a76dfd..6edb0925 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-8.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress"