From e2b42a68168a7fb2c4c231170805fb033bc0d066 Mon Sep 17 00:00:00 2001
From: dotslashf <38921923+dotslashf@users.noreply.github.com>
Date: Sat, 7 Sep 2024 01:27:29 +0700
Subject: [PATCH] fix: docker variable

---
 .github/workflows/cicd.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 036d9c8..acbeac9 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -31,10 +31,14 @@ jobs:
       - name: Build and push Docker image
         env:
           GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
+          PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
+          GITHUB_SHA: ${{ github.sha }}
+          GCE_REGION: ${{ secrets.GCE_REGION }}
+          BUCKET_NAME: ${{ secrets.BUCKET_NAME }}
         run: |
-          echo "${{ secrets.GCP_SA_KEY }}" > gcp-service-account-key.json
-          docker build --build-arg DATABASE_URL=${{ secrets.DATABASE_URL }} --build-arg GCS_BUCKET_NAME=${{ secrets.GCS_BUCKET_NAME }} --build-arg GCP_SA_KEY="${{ secrets.GCP_SA_KEY }}" -t ${{ secrets.GCE_REGION }}-docker.pkg.dev/${{ secrets.PROJECT_ID }}/arsip-template/app:$GITHUB_SHA .
-          docker push ${{ secrets.GCE_REGION }}-docker.pkg.dev/${{ secrets.PROJECT_ID }}/arsip-template/app:$GITHUB_SHA
+          echo "$GCP_SA_KEY" > gcp-service-account-key.json
+          docker build --build-arg DATABASE_URL=${{ secrets.DATABASE_URL }} --build-arg GCS_BUCKET_NAME=$BUCKET --build-arg GCP_SA_KEY="$GCP_SA_KEY" -t $GCE_REGION-docker.pkg.dev/$PROJECT_ID/arsip-template/app:$GITHUB_SHA .
+          docker push $GCE_REGION-docker.pkg.dev/$PROJECT_ID/arsip-template/app:$GITHUB_SHA
 
       - name: Setup SSH
         uses: webfactory/ssh-agent@v0.5.3
@@ -44,7 +48,7 @@ jobs:
       - name: Deploy to SSH server
         env:
           REGION: ${{ secrets.GCE_REGION }}
-          PROJECT_ID: ${{ secrets.PROJECT_ID }}
+          PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
           GITHUB_SHA: ${{ github.sha }}
           GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
         run: |
@@ -52,7 +56,7 @@ jobs:
             cd /path/to/your/project
 
             export REGION=${{ secrets.GCE_REGION }}
-            export PROJECT_ID=${{ secrets.PROJECT_ID }}
+            export PROJECT_ID=$PROJECT_ID
             export GITHUB_SHA=${{ github.sha }}
             export GCP_SA_KEY="${{ secrets.GCP_SA_KEY }}"