Update igor-oes.yml

OpsMx · Feb 20, 2024 · 37dc106 · 37dc106
1 parent 94ba8de
commit 37dc106
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/.github/workflows/igor-oes.yml b/.github/workflows/igor-oes.yml
@@ -32,7 +32,11 @@ jobs:
         id: build_variables
         run: |
           echo ::set-output name=REPO::ubi8-igor-cve
-          echo ::set-output name=VERSION::"1.30.1$(date --utc +'%Y%m%d')"
+          #echo ::set-output name=VERSION::"1.30.1$(date --utc +'%Y%m%d')"
+          #echo ::set-output name=VERSION::"1.30.1$(date --utc +'%-m%d')"
+          echo ::set-output name=VERSION::"1.30.1"
+          echo "::set-output name=GITHASH::$(git rev-parse --short HEAD)"
+          echo "::set-output name=BUILDDATE::$(date -u +"%Y%m%d%H%M")"
       - name: Login to Quay
         uses: docker/login-action@v1
         # use service account flow defined at: https://github.com/docker/login-action#service-account-based-authentication-1
@@ -80,7 +84,8 @@ jobs:
           file: docker/ubi8/Dockerfile-fips
           push: true
           tags: |
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}" 
+            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-${{ steps.build_variables.outputs.GITHASH }}-${{ steps.build_variables.outputs.BUILDDATE }}"
+    
       - name: dockerBuildpushdev
         uses: docker/build-push-action@v2
         with:
@@ -92,10 +97,12 @@ jobs:
           file: docker/ubi8/Dockerfile-dev
           push: true
           tags: |
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-dev"            
+            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-${{ steps.build_variables.outputs.GITHASH }}-${{ steps.build_variables.outputs.BUILDDATE }}-dev"
+    
       - id: get-build-name
         run: |
-            imageName=${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}
+            imageName="${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-${{ steps.build_variables.outputs.GITHASH }}-${{ steps.build_variables.outputs.BUILDDATE }}"
+    
             echo "igor=$imageName" >> $GITHUB_OUTPUT