From e6b74896f74b4037e669bab245bb6e79cc84eb59 Mon Sep 17 00:00:00 2001
From: Ruthgyeul <wingd4705@gmail.com>
Date: Mon, 12 May 2025 18:48:22 +0900
Subject: [PATCH] =?UTF-8?q?Update:=20=EC=97=AC=EB=9F=AC=20=ED=94=84?=
 =?UTF-8?q?=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EC=8B=A4=ED=96=89=20=EC=B6=A9?=
 =?UTF-8?q?=EB=8F=8C=EC=9D=84=20=EB=B0=A9=EC=A7=80=ED=95=98=EA=B8=B0=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=9C=20CI/CD=20=EC=8A=A4=ED=81=AC=EB=A6=BD?=
 =?UTF-8?q?=ED=8A=B8=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 37 +++++++++++++++++++++++++++---------
 appspec.yml                  | 11 +++++++----
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ba34a13..e1c142a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -16,9 +16,9 @@ jobs:
       - name: Create .env file
         run: |
           mkdir -p gdgocinha-fe
-          echo "DOCKER_HUB_USERNAME=${{ secrets.DOCKER_HUB_USERNAME }}" > .env
-          echo "NEXT_PUBLIC_GOOGLE_REDIRECT_CLIENT_ID=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_CLIENT_ID }}" >> .env
-          echo "NEXT_PUBLIC_GOOGLE_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI }}" >> .env
+          echo "DOCKER_HUB_USERNAME=${{ secrets.DOCKER_HUB_USERNAME }}" > gdgocinha-fe/.env
+          echo "NEXT_PUBLIC_GOOGLE_REDIRECT_CLIENT_ID=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_CLIENT_ID }}" >> gdgocinha-fe/.env
+          echo "NEXT_PUBLIC_GOOGLE_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI }}" >> gdgocinha-fe/.env
 
       - name: Login to DockerHub
         uses: docker/login-action@v2
@@ -33,12 +33,31 @@ jobs:
 
       - name: Create Deployment Package
         run: |
-          mkdir -p deploy-package
-          cp scripts/deploy.sh deploy-package/
-          cp docker-compose.yml deploy-package/
-          cp appspec.yml deploy-package/
-          cp .env deploy-package/
-          zip -r deploy-gdgocinha-fe.zip deploy-package/
+          # Create deployment directory structure
+          mkdir -p deploy-package/gdgocinha-fe
+          
+          # Copy necessary files
+          cp scripts/deploy.sh deploy-package/gdgocinha-fe/
+          cp docker-compose.yml deploy-package/gdgocinha-fe/
+          cp appspec.yml deploy-package/gdgocinha-fe/
+          cp gdgocinha-fe/.env deploy-package/gdgocinha-fe/
+          
+          # Copy nginx configuration
+          mkdir -p deploy-package/gdgocinha-fe/nginx
+          cp nginx/gdgocinha.com.conf deploy-package/gdgocinha-fe/nginx/
+          
+          # Create logs directory
+          mkdir -p deploy-package/gdgocinha-fe/logs
+          mkdir -p deploy-package/gdgocinha-fe/logs/docker
+          mkdir -p deploy-package/gdgocinha-fe/logs/app
+          mkdir -p deploy-package/gdgocinha-fe/logs/deploy
+          
+          # Set proper permissions
+          chmod +x deploy-package/gdgocinha-fe/deploy.sh
+          
+          # Create deployment package
+          cd deploy-package
+          zip -r ../deploy-gdgocinha-fe.zip .
 
       - name: Configure AWS credentials
         run: |
diff --git a/appspec.yml b/appspec.yml
index 051b990..9d9a99d 100644
--- a/appspec.yml
+++ b/appspec.yml
@@ -1,20 +1,23 @@
 version: 0.0
 os: linux
 files:
-  - source: /
+  - source: gdgocinha-fe/
     destination: /home/ubuntu/gdgocinha-fe
     overwrite: true
+    mode: 0644
+    owner: ubuntu
+    group: ubuntu
 
 hooks:
   BeforeInstall:
-    - location: deploy.sh
+    - location: gdgocinha-fe/deploy.sh
       timeout: 300
       runas: root
   AfterInstall:
-    - location: deploy.sh
+    - location: gdgocinha-fe/deploy.sh
       timeout: 300
       runas: root
   ApplicationStart:
-    - location: deploy.sh
+    - location: gdgocinha-fe/deploy.sh
       timeout: 300
       runas: root