fix: 환경 변수 적용 안된 부분 수정 (#67)

* fix: 환경변수 설정 부분 변경 * fix: 누락된 부분 수정 * fix: 환경변수 적용 안된 부분 수정
SilentBombers · Dec 1, 2023 · 28acbc1 · 28acbc1
1 parent 9862927
commit 28acbc1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/click-service-cd.yml b/.github/workflows/click-service-cd.yml
@@ -9,6 +9,7 @@ env:
   REGION: ${{ secrets.REGION }}
   WORKSTATION_IMAGE: click-service
   VERSION: '1.0.0'
+  IMAGE: ${{env.REGION}}-docker.pkg.dev/${{env.PROJECT_ID}}/${{env.DOCKER_REPO}}/${{env.WORKSTATION_IMAGE}}
 
 jobs:
   build:
@@ -25,7 +26,7 @@ jobs:
         run : |
           envsubst < ./resources.yaml > ./resources.yaml
         env:
-          spec.template.spec.containers.image: ${{env.REGION}}-docker.pkg.dev/${{env.PROJECT_ID}}/${{env.DOCKER_REPO}}/${{env.WORKSTATION_IMAGE}}
+          spec.template.spec.containers.image: ${{env.IMAGE}}
 
       - name: Set Application Yml
         run : |
@@ -67,10 +68,10 @@ jobs:
         run: ../gradlew docker
 
       - name: Docker tag
-        run: docker tag click-me-${{env.WORKSTATION_IMAGE}}:${{env.VERSION}} ${{env.image}}
+        run: docker tag click-me-${{env.WORKSTATION_IMAGE}}:${{env.VERSION}} ${{env.IMAGE}}
 
       - name: Docker Push
-        run: docker push ${{env.image}}
+        run: docker push ${{env.IMAGE}}
 
       - name: Deploy
         run: kubectl apply -f ./resources.yaml

diff --git a/.github/workflows/transfer-service-cd.yml b/.github/workflows/transfer-service-cd.yml
@@ -9,6 +9,7 @@ env:
   REGION: ${{ secrets.REGION }}
   WORKSTATION_IMAGE: transfer-service
   VERSION: '1.0.0'
+  IMAGE: ${{env.REGION}}-docker.pkg.dev/${{env.PROJECT_ID}}/${{env.DOCKER_REPO}}/${{env.WORKSTATION_IMAGE}}
 
 jobs:
   build:
@@ -55,9 +56,7 @@ jobs:
         run: ../gradlew docker
 
       - name: Docker tag
-        env:
-          image: ${{env.REGION}}-docker.pkg.dev/${{env.PROJECT_ID}}/${{env.DOCKER_REPO}}/${{env.WORKSTATION_IMAGE}}
-        run: docker tag click-me-${{env.WORKSTATION_IMAGE}}:${{env.VERSION}} ${{env.image}}
+        run: docker tag click-me-${{env.WORKSTATION_IMAGE}}:${{env.VERSION}} ${{env.IMAGE}}
 
       - name: Docker Push
-        run: docker push ${{env.image}}
+        run: docker push ${{env.IMAGE}}