From 2e83acfe93e5e3658f11c79ae2ae1477fbabe1b9 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Thu, 5 Feb 2026 18:44:47 -0500 Subject: [PATCH 1/3] Enhance Docker build caching and update documentation (#324) (#325) * Develop (#319) * Update docker hub readme task and fix version in README (#316) * Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318) * Update docker hub readme task and fix version in README (#316) (#317) * Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings --------- --------- * Fix syntax in jq command for generating docker hub repositories (#320) * Update cache-to logic in Docker build step for feature branches (#321) * fix: Add cache_tag to base image definitions for improved caching in Docker builds --------- Signed-off-by: Pieter Viljoen --- .github/workflows/build-base-images-task.yml | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-base-images-task.yml b/.github/workflows/build-base-images-task.yml index c59ff426..9705c6ea 100644 --- a/.github/workflows/build-base-images-task.yml +++ b/.github/workflows/build-base-images-task.yml @@ -17,14 +17,16 @@ jobs: strategy: matrix: base: - - name: nx-base - dockerfile: Docker/NxBase.Dockerfile - tags: | - docker.io/ptr727/nx-base:ubuntu-noble - - name: nx-base-lsio - dockerfile: Docker/NxBase-LSIO.Dockerfile - tags: | - docker.io/ptr727/nx-base-lsio:ubuntu-noble + - name: nx-base + dockerfile: Docker/NxBase.Dockerfile + cache_tag: docker.io/ptr727/nx-base:ubuntu-noble + tags: | + docker.io/ptr727/nx-base:ubuntu-noble + - name: nx-base-lsio + dockerfile: Docker/NxBase-LSIO.Dockerfile + cache_tag: docker.io/ptr727/nx-base-lsio:ubuntu-noble + tags: | + docker.io/ptr727/nx-base-lsio:ubuntu-noble steps: @@ -55,9 +57,9 @@ jobs: context: Docker file: ${{ matrix.base.dockerfile }} platforms: linux/amd64,linux/arm64 - tags: ${{ matrix.base.tags }} - cache-from: | - type=registry,ref=${{ matrix.base.tags }} + tags: ${{ matrix.base.tags }} + cache-from: | + type=registry,ref=${{ matrix.base.cache_tag }} type=gha,scope=develop-base-${{ matrix.base.name }} type=gha,scope=main-base-${{ matrix.base.name }} ${{ github.event.pull_request && format('type=gha,scope=pr-base-{0}-{1}', github.event.pull_request.number, matrix.base.name) || '' }} From 2dba53b5ea32318133f702ee2ab51e495b45c491 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Wed, 11 Feb 2026 12:38:56 +0200 Subject: [PATCH 2/3] Squash merge Signed-off-by: Pieter Viljoen --- .github/workflows/merge-bot-pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml index 615ed525..f1f94cb3 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -27,7 +27,7 @@ jobs: - name: Merge pull request step if: steps.metadata.outputs.update-type != 'version-update:semver-major' - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: ${{secrets.GITHUB_TOKEN}} @@ -43,7 +43,7 @@ jobs: steps: - name: Merge pull request step - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: ${{secrets.GITHUB_TOKEN}} From 35c70c7da1f93aa5d3029a06ee4d72513e83bc2e Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Wed, 11 Feb 2026 12:52:22 +0200 Subject: [PATCH 3/3] just squash Signed-off-by: Pieter Viljoen --- .github/workflows/merge-bot-pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml index f1f94cb3..e62689d5 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -27,7 +27,7 @@ jobs: - name: Merge pull request step if: steps.metadata.outputs.update-type != 'version-update:semver-major' - run: gh pr merge --auto --squash --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: ${{secrets.GITHUB_TOKEN}} @@ -43,7 +43,7 @@ jobs: steps: - name: Merge pull request step - run: gh pr merge --auto --squash --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: ${{secrets.GITHUB_TOKEN}}