Merge pull request red-hat-storage#412 from iamniting/action

action: add a new image target to the action
iamniting · May 17, 2024 · b57244f · b57244f
2 parents c45f64d + 98a7ee3
commit b57244f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -71,6 +71,6 @@ jobs:
         OPM_RENDER_OPTS: --use-http
       run: |
         docker run -d -p 5000:5000 --name registry registry:2
-        make bundle-build bundle-push catalog-build
+        make bundle-build bundle-push catalog-build catalog-deps-build
         msg='Uncommitted catalog changes. run `make catalog` and commit results.'
         git diff --exit-code catalog || (echo -e '\e[31m'"$msg"; exit 1)
diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml
@@ -7,8 +7,8 @@ on:
         required: true
         default: ocs-dev
       IMAGE_TAG:
-        required: true
-        default: latest
+        required: false
+        default: ""
 
 jobs:
   docker-push:
@@ -32,7 +32,11 @@ jobs:
       env:
         REGISTRY_NAMESPACE: ${{ github.event.inputs.REGISTRY_NAMESPACE }}
         IMAGE_TAG: ${{ github.event.inputs.IMAGE_TAG }}
+        IMAGE_TAG_SHA: ${{ github.ref_name }}-${{ github.sha }}
       run: |
+        # Set IMAGE_TAG to a calculated <branch>-<sha> if not specified
+        export IMAGE_TAG=${IMAGE_TAG:-${IMAGE_TAG_SHA:0:-33}}
         make docker-build docker-push
         make bundle-build bundle-push
         make catalog-build catalog-push
+        make catalog-deps-build catalog-deps-push