From 341c3115d6415adc819dd2331fb5b06654ac470d Mon Sep 17 00:00:00 2001
From: Suke-H <hondii1997@gmail.com>
Date: Mon, 23 Sep 2024 22:55:18 +0900
Subject: [PATCH] =?UTF-8?q?:green=5Fheart:=20deployFix:=20.env=E3=81=AE?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yaml | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index da98e0c..42ab9d2 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -34,6 +34,9 @@ jobs:
           project_id: ${{ secrets.PROJECT_ID }}
           install_components: 'beta'
 
+      - name: Create .env file
+        run: echo "${{ secrets.ENV_FILE }}" > .env
+
       - name: Build Docker image
         run: |
           docker build --no-cache --build-arg NODE_ENV=production -t gcr.io/${{ secrets.PROJECT_ID }}/${{ env.SERVICE_NAME }}:$GITHUB_SHA .
@@ -43,29 +46,19 @@ jobs:
           gcloud auth configure-docker
           docker push gcr.io/${{ secrets.PROJECT_ID }}/${{ env.SERVICE_NAME }}:$GITHUB_SHA
 
-      - name: Create .env file
-        run: echo "${{ secrets.ENV_FILE }}" > .env
-
-      - name: Create env.yaml for Cloud Run
-        run: |
-          source .env
-          cat << EOF > env.yaml
-          SLACK_BOT_TOKEN: '${SLACK_BOT_TOKEN}'
-          NODE_ENV: '${NODE_ENV}'
-          NOTION_INTEGRATION_TOKEN: '${NOTION_INTEGRATION_TOKEN}'
-          NOTION_DATABASE_ID: '${NOTION_DATABASE_ID}'
-          USER_IDS: '${USER_IDS}'
-          USER_NAMES: '${USER_NAMES}'
-          CHANNEL_IDS: '${CHANNEL_IDS}'
-          WEBHOOK_URLS: '${WEBHOOK_URLS}'
-          EOF
-
       - name: Deploy to Cloud Run
         run: |
+          source .env
           gcloud run deploy ${{ env.SERVICE_NAME }} \
             --image gcr.io/${{ secrets.PROJECT_ID }}/${{ env.SERVICE_NAME }}:$GITHUB_SHA \
             --platform managed \
             --region ${{ env.REGION }} \
             --allow-unauthenticated \
-            --env-vars-file env.yaml \
-            --set-env-vars PORT=8080
\ No newline at end of file
+            --set-env-vars "SLACK_BOT_TOKEN=${SLACK_BOT_TOKEN}" \
+            --set-env-vars "NODE_ENV=${NODE_ENV}" \
+            --set-env-vars "NOTION_INTEGRATION_TOKEN=${NOTION_INTEGRATION_TOKEN}" \
+            --set-env-vars "NOTION_DATABASE_ID=${NOTION_DATABASE_ID}" \
+            --set-env-vars "USER_IDS=${USER_IDS}" \
+            --set-env-vars "USER_NAMES=${USER_NAMES}" \
+            --set-env-vars "CHANNEL_IDS=${CHANNEL_IDS}" \
+            --set-env-vars "WEBHOOK_URLS=${WEBHOOK_URLS}"
\ No newline at end of file