Merge pull request #122 from cyber-dojo/add-base-image-digest-as-inpu…

…t-parameter Add base-image digest as workflow input
cyber-dojo · Feb 2, 2025 · 6d45e05 · 6d45e05
2 parents a181df2 + f4f69e8
commit 6d45e05
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/base_image_trigger.yml b/.github/workflows/base_image_trigger.yml
@@ -3,8 +3,11 @@ name: Base Image Update
 on:
   workflow_dispatch:
     inputs:
-      base_image:
-        description: "Image-Tag for cyberdojo/sinatra (short commit SHA - first 7 digits) eg edb2887"
+      base_image_tag:
+        description: "Image-Tag for cyberdojo/sinatra (short commit SHA - first 7 digits), eg edb2887"
+        required: true
+      base_image_digest:
+        description: "Image-Digest for cyberdojo/sinatra, eg ddab9080c..."
         required: true
 
 
@@ -18,8 +21,9 @@ jobs:
       - name: Outputs
         id: vars
         run: | 
-          echo "base_image=cyberdojo/sinatra-base:${{ inputs.base_image }}" >> ${GITHUB_OUTPUT}
-          echo "kosli_trail=base-image-update-${{ inputs.base_image }}"     >> ${GITHUB_OUTPUT}
+          TAG_WITH_DIGEST="${{ inputs.base_image_tag }}@sha256:${{ inputs.base_image_digest }}"
+          echo "base_image=cyberdojo/sinatra-base:${TAG_WITH_DIGEST}"       >> ${GITHUB_OUTPUT}
+          echo "kosli_trail=base-image-update-${{ inputs.base_image_tag }}" >> ${GITHUB_OUTPUT}
       
 
   trigger:

diff --git a/bin/lib.sh b/bin/lib.sh
@@ -3,7 +3,7 @@ echo_base_image()
 {
   local -r json="$(curl --fail --silent --request GET https://beta.cyber-dojo.org/saver/base_image)"
   echo "${json}" | jq -r '.base_image'
-  #echo cyberdojo/sinatra-base:edb2887@sha256:d40099e71ac46310a58cea1640f5fb842dbaadc148e4973bfb8d2092516370a1
+  # echo cyberdojo/sinatra-base:edb2887@sha256:d40099e71ac46310a58cea1640f5fb842dbaadc148e4973bfb8d2092516370a1
 }
 
 echo_env_vars()