fix: update build-docker examples from Dockers2

see
CCBR/Dockers2#389

resolves #151

Author: kelly-sovacool

examples/build-docker-auto.yml

@@ -19,6 +19,10 @@
 
 name: build-docker-auto
 
+permissions:
+  contents: write
+  pull-requests: write
+
 on:
   push:
     branches:
@@ -32,12 +36,17 @@ on:
       - dev
     paths:
       - "**/Dockerfile.*" # Only trigger if a Dockerfile.* is modified in any directory
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review # Ensures the workflow triggers only when a draft is marked "Ready for Review"
 
 env:
-  suffix: ${{ github.base_ref == 'main' && github.event_name == 'pull_request' && 'main' || github.base_ref == 'dev' && github.event_name == 'pull_request' && 'dev' || 'feat' }}
-
-permissions:
-  contents: read
+  suffix:
+    ${{ github.base_ref == 'main' && github.event_name == 'pull_request' &&
+    'main' || github.base_ref == 'dev' && github.event_name == 'pull_request' &&
+    'dev' || 'feat' }}
 
 jobs:
   get-files:
@@ -48,22 +57,35 @@ jobs:
       - name: Checkout repository
         id: checkout
         uses: actions/checkout@v6
+        with:
+          fetch-depth: 2 # Need parent commit to diff against for HEAD~1..HEAD
+          ref: ${{ github.head_ref || github.ref_name }}
 
       - id: changed-files
         name: Check changed files
-        uses: knu/changed-files@v1
-        with:
-          paths: |
-            **/Dockerfile.*
+        # Compare only the latest commit (HEAD~1..HEAD) so that subsequent pushes
+        # to a PR do not re-trigger builds for Dockerfiles touched in earlier commits.
+        run: |
+          files=$(git diff --name-only HEAD~1 HEAD | grep -E '(^|/)Dockerfile\.' || true)
+          echo "matched_files<<EOF" >> "$GITHUB_OUTPUT"
+          echo "$files" >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+          if [ -z "$files" ]; then
+            echo 'matched_files_json=[]' >> "$GITHUB_OUTPUT"
+          else
+            json=$(echo "$files" | jq -R -s 'split("\n") | map(select(length > 0))')
+            echo "matched_files_json=$json" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Show changed files
         id: matrix
         run: |
           echo "matched files:"
-          echo "${{ steps.changed-files.outputs.matched_files }}" | sed 's|^|  |'
+          echo "${{ steps.changed-files.outputs.matched_files }}" | sed 's/^/  /'
 
   build-docker:
     needs: [get-files]
+    if: needs.get-files.outputs.json != '[]' # Skip if no Dockerfiles changed in the latest commit
     strategy:
       matrix:
         file: "${{ fromJson(needs.get-files.outputs.json) }}"
@@ -76,18 +98,10 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v6
-        name: "checkout PR ${{ github.head_ref }}"
-        if: github.event_name == 'pull_request'
-        with:
-          fetch-depth: 0
-          ref: ${{ github.head_ref }} # branch name of PR
-
-      - uses: actions/checkout@v6
-        name: "checkout push ${{ github.ref_name }}"
-        if: github.event_name == 'push'
+        name: Checkout repository
         with:
           fetch-depth: 0
-          ref: ${{ github.ref_name }} # branch name of push
+          ref: ${{ github.head_ref || github.ref_name }}
 
       - uses: CCBR/actions/build-docker@latest
         with:
@@ -97,6 +111,4 @@ jobs:
           dockerhub-token: ${{ secrets.DOCKERHUBRW_TOKEN_VK }}
           suffix: ${{ env.suffix }}
           push: true
-          ccbr-actions-version: v0.3
           github-token: ${{ github.token }}
-          config-file: "scripts/tool_version_commands.txt"

examples/build-docker-manual.yml

@@ -20,12 +20,17 @@
 name: build-docker-manual
 run-name: build-docker ${{ inputs.dockerfile }}-${{ inputs.suffix }}
 
+permissions:
+  contents: write
+  pull-requests: write
+
 on:
   workflow_dispatch:
     inputs:
       dockerfile:
         type: string
-        description: path to the Dockerfile in the repo (e.g. common/ccbr_bwa/Dockerfile)
+        description: path to the Dockerfile in the repo (e.g.
+          base_images/ccbr_ubuntu_22.04/Dockerfile.v4)
         required: true
       dockerhub-namespace:
         type: string
@@ -34,32 +39,34 @@ on:
         default: nciccbr
       suffix:
         type: string
-        description: Suffix to add to image tag eg. "dev" to add "-dev"
+        description: Suffix to add to image tag (e.g. "dev" to add "-dev")
         required: true
         default: feat
       push:
         type: boolean
-        description: Push to DockerHub (leave unchecked to just build the container without pushing)
+        description:
+          Push to DockerHub (leave unchecked to just build the container
+          without pushing)
         required: true
         default: false
       ccbr-actions-version:
-        description: "The version of ccbr_actions to use"
+        description: "The version or branch of ccbr_actions to use (see
+          https://github.com/ccbr/actions)"
         required: true
-        default: "v0.3"
-
-permissions:
-  contents: read
+        default: "latest"
 
 jobs:
   build-docker:
     runs-on: ubuntu-latest
     permissions:
-      contents: write
+      contents: "write"
       pull-requests: write
     steps:
       - name: Checkout repository
         id: checkout
         uses: actions/checkout@v6
+        with:
+          ref: ${{ github.head_ref || github.ref_name }}
 
       - uses: CCBR/actions/build-docker@latest
         with:
@@ -71,4 +78,4 @@ jobs:
           push: ${{ github.event.inputs.push }}
           ccbr-actions-version: ${{ github.event.inputs.ccbr-actions-version }}
           github-token: ${{ github.token }}
-          config-file: "scripts/tool_version_commands.txt"
+          github-actor: ${{ github.actor }}