From c1ba60a86232588f9d75a2211e89b2a42067d7a0 Mon Sep 17 00:00:00 2001
From: dotslashf <38921923+dotslashf@users.noreply.github.com>
Date: Sat, 7 Sep 2024 01:19:50 +0700
Subject: [PATCH] fix: update

---
 .github/workflows/cicd.yml | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 4e8b61f..b7e90c6 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -9,18 +9,6 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
 
-    env:
-      PROJECT_ID: ${{ secrets.PROJECT_ID }}
-      GCE_INSTANCE: ${{ secrets.GCE_INSTANCE }}
-      GCE_INSTANCE_ZONE: ${{ secrets.GCE_INSTANCE_ZONE }}
-      REGION: ${{ secrets.GCE_REGION }}
-      SSH_HOST: ${{ secrets.SSH_HOST }}
-      SSH_USER: ${{ secrets.SSH_USER }}
-      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-      GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
-      DATABASE_URL: ${{ secrets.DATABASE_URL }}
-      GCS_BUCKET_NAME: ${{ secrets.BUCKET_NAME }}
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -38,16 +26,15 @@ jobs:
 
       - name: Configure Docker for Artifact Registry
         run: |
-          gcloud auth configure-docker ${{ env.REGION }}-docker.pkg.dev
+          gcloud auth configure-docker ${{ secrets.REGION }}-docker.pkg.dev
 
       - name: Build and push Docker image
         env:
           GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
-          PROJECT_ID: ${{ secrets.PROJECT_ID }}
         run: |
-          echo "$GCP_SA_KEY" > gcp-service-account-key.json
-          docker build --build-arg DATABASE_URL=${{secrets.DATABASE_URL}} --build-arg GCS_BUCKET_NAME=${{secrets.BUCKET_NAME}} --build-arg GCP_SA_KEY="$GCP_SA_KEY" -t $REGION-docker.pkg.dev/$PROJECT_ID/arsip-template/app:${{ github.sha }} .
-          docker push $REGION-docker.pkg.dev/$PROJECT_ID/arsip-template/app:${{ github.sha }}
+          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.REGION }}-docker.pkg.dev/${{ secrets.PROJECT_ID }}/arsip-template/app:$GITHUB_SHA .
+          docker push ${{ secrets.REGION }}-docker.pkg.dev/${{ secrets.PROJECT_ID }}/arsip-template/app:$GITHUB_SHA
 
       - name: Setup SSH
         uses: webfactory/ssh-agent@v0.5.3
@@ -55,12 +42,22 @@ jobs:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
       - name: Deploy to SSH server
+        env:
+          REGION: ${{ secrets.REGION }}
+          PROJECT_ID: ${{ secrets.PROJECT_ID }}
+          GITHUB_SHA: ${{ github.sha }}
+          GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
         run: |
-          ssh -o StrictHostKeyChecking=no ${{ env.SSH_USER }}@${{ env.SSH_HOST }} '
+          ssh -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} '
             cd /path/to/your/project
 
+            export REGION=${{ secrets.REGION }}
+            export PROJECT_ID=${{ secrets.PROJECT_ID }}
+            export GITHUB_SHA=${{ github.sha }}
+            export GCP_SA_KEY="${{ secrets.GCP_SA_KEY }}"
+
             # Update docker-compose.yml to include GCP_SA_KEY
-            sed -i "s|GCP_SA_KEY=.*|GCP_SA_KEY=${{ env.GCP_SA_KEY }}|g" docker-compose.yml
+            sed -i "s|GCP_SA_KEY=.*|GCP_SA_KEY=$GCP_SA_KEY|g" docker-compose.yml
 
             docker-compose pull
             docker-compose down