.

peterbogdan · Jul 6, 2024 · f6b2e56 · f6b2e56
1 parent 21a8d47
commit f6b2e56
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/.github/actions/build/docker/action.yml b/.github/actions/build/docker/action.yml
@@ -13,9 +13,6 @@ inputs:
   commit_sha:
     required: true
     description: Define the SHA1 git commit hash
-  docker_tag:
-    required: true
-    description: Define the Docker tag
   docker_hub_org:
     required: true
     description: Pass DockerHub org to action
@@ -103,7 +100,6 @@ runs:
       run: |
         mkdir -p /tmp/digests
         digest="${{ steps.docker_build.outputs.digest }}"
-        echo "${digest}"
         touch "/tmp/digests/${digest#sha256:}"
 
     ########################### Upload digest ###########################

diff --git a/.github/actions/tagged_release/docker/codesign/action.yml b/.github/actions/tagged_release/docker/codesign/action.yml
@@ -64,7 +64,7 @@ runs:
           IMAGE_NAME="${{ inputs.docker_hub_org }}/osctrl-${{ inputs.osctrl_component }}:$tag"
           for digest in ${{ inputs.docker_image_digest }}
           do
-            cosign sign --key cosign.key docker.io/$IMAGE_NAME@$digest
+            cosign sign --key cosign.key docker.io/$IMAGE_NAME@sha256:$digest
           done
         done
         rm -f cosign.key
@@ -79,7 +79,7 @@ runs:
           IMAGE_NAME="${{ inputs.docker_hub_org }}/osctrl-${{ inputs.osctrl_component }}:$tag"
           for digest in ${{ inputs.docker_image_digest }}
           do
-            cosign verify --key cosign.key docker.io/$IMAGE_NAME@$digest
+            cosign verify --key cosign.key docker.io/$IMAGE_NAME@sha256:$digest
           done
         done
         rm -f cosign.key
diff --git a/.github/workflows/build_and_test_main_merge.yml b/.github/workflows/build_and_test_main_merge.yml
@@ -131,7 +131,6 @@ jobs:
           #### Build vars ####
           osctrl_component: ${{ matrix.components }}
           commit_sha: ${{ steps.vars.outputs.sha_short }}
-          docker_tag: ${{ steps.vars.outputs.sha_short }}
           #### Dockerhub creds ####
           docker_hub_org: ${{ secrets.DOCKER_HUB_ORG }}
           docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}

diff --git a/.github/workflows/create_tagged_releases.yml b/.github/workflows/create_tagged_releases.yml
@@ -133,7 +133,6 @@ jobs:
           #### Build vars ####
           osctrl_component: ${{ matrix.components }}
           commit_sha: ${{ steps.vars.outputs.sha_short }}
-          docker_tag: ${{ steps.vars.outputs.branch }}
           #### Dockerhub creds ####
           docker_hub_org: ${{ secrets.DOCKER_HUB_ORG }}
           docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -179,7 +178,7 @@ jobs:
           working-directory: /tmp/digests
           run: |
             docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-              $(printf '${{ secrets.DOCKER_HUB_ORG }}/osctrl-${{ matrix.components }}@%s ' *)
+              $(printf '${{ secrets.DOCKER_HUB_ORG }}/osctrl-${{ matrix.components }}@sha256:%s ' *)
 
         - name: Export digests and tags for cosign
           id: docker_vars
@@ -210,7 +209,7 @@ jobs:
             docker buildx imagetools inspect ${{ secrets.DOCKER_HUB_ORG }}/osctrl-${{ matrix.components }}:${{ steps.meta.outputs.version }}
 
   create_release:
-    needs: [build_and_test,create_deb_packages,create_docker_images]
+    needs: [build_and_test,create_deb_packages,push_docker_images]
     runs-on: ubuntu-22.04
     strategy:
       matrix: