From 28acbc1b7a786cdcedd325b7479bd6e1cc299cc5 Mon Sep 17 00:00:00 2001
From: Seungrae <obey1342@gmail.com>
Date: Sat, 2 Dec 2023 01:05:39 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=ED=99=98=EA=B2=BD=20=EB=B3=80=EC=88=98?=
 =?UTF-8?q?=20=EC=A0=81=EC=9A=A9=20=EC=95=88=EB=90=9C=20=EB=B6=80=EB=B6=84?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20(#67)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 환경변수 설정 부분 변경

* fix: 누락된 부분 수정

* fix: 환경변수 적용 안된 부분 수정
---
 .github/workflows/click-service-cd.yml    | 7 ++++---
 .github/workflows/transfer-service-cd.yml | 7 +++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/click-service-cd.yml b/.github/workflows/click-service-cd.yml
index 186c55b..afd33af 100644
--- 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
index eb46118..885882c 100644
--- 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}}