ci: update registry env (#643)

Signed-off-by: Heba <[email protected]>
virtual-kubelet · Aug 13, 2024 · 2e9b02e · 2e9b02e
1 parent 1051c96
commit 2e9b02e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
@@ -17,23 +17,21 @@ permissions:
   actions: read
 
 env:
-  REGISTRY: ghcr.io
   # Common versions
   GO_VERSION: '1.20'
   IMAGE_NAME: 'virtual-kubelet'
 
 jobs:
   publish-images:
-    env:
-      REGISTRY: ${{ github.event.client_payload.registry }}
     runs-on: ubuntu-latest
     steps:
-      - name: Login to ${{ env.REGISTRY }}
+      - name: Login to ${{ github.event.client_payload.registry }}
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ github.event.client_payload.registry }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Set Image tag
         run: |
           ver=${{ github.event.client_payload.release_version }}
@@ -43,11 +41,12 @@ jobs:
           OUTPUT_TYPE=type=registry make docker-build-image
         env:
           VERSION: ${{ env.IMG_TAG }}
+          REGISTRY: ${{ github.event.client_payload.registry }}
 
-      - name: Scan ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMG_TAG }}
+      - name: Scan ${{ github.event.client_payload.registry }}/${{ env.IMAGE_NAME }}:${{ env.IMG_TAG }}
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMG_TAG }}"
+          image-ref: "${{ github.event.client_payload.registry }}/${{ env.IMAGE_NAME }}:${{ env.IMG_TAG }}"
           format: 'table'
           exit-code: '1'
           ignore-unfixed: true

diff --git a/.github/workflows/publish-init-container-image.yml b/.github/workflows/publish-init-container-image.yml
@@ -17,15 +17,12 @@ permissions:
   actions: read
 
 env:
-  REGISTRY: ghcr.io
   # Common versions
   GO_VERSION: '1.20'
   INIT_IMAGE_NAME: 'init-validation'
 
 jobs:
   publish-init-images:
-    env:
-      REGISTRY: ${{ github.event.client_payload.registry }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -34,10 +31,10 @@ jobs:
           fetch-depth: 0
           ref: ${{ steps.get-tag.outputs.tag }}
 
-      - name: Login to ${{ env.REGISTRY }}
+      - name: Login to ${{ github.event.client_payload.registry }}
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ github.event.client_payload.registry }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
@@ -50,11 +47,12 @@ jobs:
           OUTPUT_TYPE=type=registry make docker-build-init-image
         env:
           INIT_IMG_TAG: ${{ env.INIT_IMG_TAG }}
+          REGISTRY: ${{ github.event.client_payload.registry }}
 
-      - name: Scan ${{ env.REGISTRY }}/${{ env.INIT_IMAGE_NAME }}:${{ env.INIT_IMG_TAG }}
+      - name: Scan ${{ github.event.client_payload.registry }}/${{ env.INIT_IMAGE_NAME }}:${{ env.INIT_IMG_TAG }}
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: "${{ env.REGISTRY }}/${{ env.INIT_IMAGE_NAME }}:${{ env.INIT_IMG_TAG }}"
+          image-ref: "${{ github.event.client_payload.registry }}/${{ env.INIT_IMAGE_NAME }}:${{ env.INIT_IMG_TAG }}"
           format: 'table'
           exit-code: '1'
           ignore-unfixed: true