Merge branch 'develop' into feat77/main

Author: pwc2002

.github/workflows/deploy.yml

@@ -13,43 +13,41 @@ jobs:
     - name: Checkout Code
       uses: actions/checkout@v3
 
+    - name: Create .env file
+      run: |
+        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
+
     - name: Login to DockerHub (Optional)
       uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_HUB_USERNAME }}
         password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
-
     - name: Build and Push Docker Image
       run: |
         docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/gdgoc-fe-app:latest .
         docker run --rm ${{ secrets.DOCKER_HUB_USERNAME }}/gdgoc-fe-app:latest ls -la /app
         docker push ${{ secrets.DOCKER_HUB_USERNAME }}/gdgoc-fe-app:latest
 
-      
     - name: Create Deployment Package
       run: |
         cp scripts/deploy.sh ./deploy.sh
-        echo "DOCKER_HUB_USERNAME=${{ secrets.DOCKER_HUB_USERNAME }}" > .env
-
         zip -r deploy.zip .env docker-compose.yml deploy.sh appspec.yml \
             Dockerfile package.json package-lock.json next.config.mjs \
             pages public .next
 
-
-
     - name: Configure AWS credentials
       run: |
         aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         aws configure set region ${{ secrets.AWS_REGION }}
 
-
     - name: Upload Deployment Package to S3
       run: |
         aws s3 cp deploy.zip s3://${{ secrets.AWS_S3_BUCKET }}/deploy.zip
 
-
     - name: Trigger CodeDeploy (CLI)
       env:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.github/workflows/note.md

@@ -0,0 +1 @@
+충돌 방지 CICD 설계 필요

Dockerfile

@@ -7,6 +7,9 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 RUN npm install
 
+# .env 파일을 먼저 복사
+COPY .env ./
+
 # 이후 전체 파일 복사
 COPY . .
 
@@ -31,6 +34,9 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm install --omit=dev
 
+# .env 파일 복사
+COPY .env ./
+
 # 빌드된 결과물 가져오기
 COPY --from=builder /app/.next ./.next
 COPY --from=builder /app/public ./public