diff --git a/.env b/.env index c9729493..1aedaf5d 100644 --- a/.env +++ b/.env @@ -3,7 +3,7 @@ APP_NAME="ghostfire" GITHUB_USER="firepress-org" -APP_VERSION="5.112.0" +APP_VERSION="5.113.0" ### function options CFG_USE_GPG_SIGNATURE="false" diff --git a/.github/workflows/ghostv5.yml b/.github/workflows/ghostv5.yml index bf162b1e..9e6c0017 100644 --- a/.github/workflows/ghostv5.yml +++ b/.github/workflows/ghostv5.yml @@ -193,12 +193,15 @@ jobs: # linux/arm/v8 # linux/arm/v7 push: true + # The order for `docker push -tag` matters for our CD down the line tags: | ${{ needs.myvars.outputs.TAG_DKR_BRANCH_NAME }} ${{ needs.myvars.outputs.TAG_GPR_BRANCH_NAME }} - # The order for matters for our CD down the line - cache-from: type=gha, scope=${{ github.workflow }} - cache-to: type=gha, scope=${{ github.workflow }}, mode=max + # This configuration intentionally uses the SAME cache reference for both jobs. + # The goal is for the 'stable' build (triggered by a tag) to reuse the + # layers already created by the 'edge' build on the master branch. + cache-from: type=registry,ref=${{ needs.myvars.outputs.GPR_PREFIX }}:buildcache-${{ env.SUB_DIR }}-${{ github.run_id }} + cache-to: type=registry,ref=${{ needs.myvars.outputs.GPR_PREFIX }}:buildcache-${{ env.SUB_DIR }}-${{ github.run_id }},mode=max build-args: | BUILDKIT_PROGRESS=plain network: host @@ -278,6 +281,7 @@ jobs: # linux/arm/v8 # linux/arm/v7 push: true + # The order for `docker push -tag` matters for our CD down the line tags: | ${{ needs.myvars.outputs.TAG_DKR_VERSION }} ${{ needs.myvars.outputs.TAG_DKR_BRANCH_NAME }} @@ -287,9 +291,8 @@ jobs: ${{ needs.myvars.outputs.TAG_GPR_BRANCH_NAME }} ${{ needs.myvars.outputs.TAG_GPR_VERSION_HASH_ONLY }} ${{ needs.myvars.outputs.TAG_GPR_VERSION_HASH_DATE }} - # The order for matters for our CD down the line - cache-from: type=gha, scope=${{ github.workflow }} - cache-to: type=gha, scope=${{ github.workflow }}, mode=max + cache-from: type=registry,ref=${{ needs.myvars.outputs.GPR_PREFIX }}:buildcache-${{ env.SUB_DIR }}-${{ github.run_id }} + cache-to: type=registry,ref=${{ needs.myvars.outputs.GPR_PREFIX }}:buildcache-${{ env.SUB_DIR }}-${{ github.run_id }},mode=max build-args: | BUILDKIT_PROGRESS=plain network: host diff --git a/v5/Dockerfile b/v5/Dockerfile index 76ebdaf3..3db7f4ad 100755 --- a/v5/Dockerfile +++ b/v5/Dockerfile @@ -4,7 +4,7 @@ # 1a) ENV variables (core for all our projects at FirePress) # ---------------------------------------------- ARG APP_NAME="ghostfire" -ARG VERSION="5.112.0" +ARG VERSION="5.113.0" ARG GITHUB_USER="firepress-org" ARG DEFAULT_BRANCH="master"