From 2bd713e0bff4deb119640b0bf1fa387fb225e228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=82=98=EA=B2=BD=ED=98=B8?= <hoyana1225@gmail.com>
Date: Wed, 3 Jul 2024 23:36:53 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20QuestionController=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

배포 테스트
---
 .github/workflows/ci-cd.yml | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index b7bab62..a5117c6 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -40,20 +40,6 @@ jobs:
           echo "${{ secrets.YML_DEV }}" > ./application-dev.yml
         shell: bash
 
-      # docker compose 파일 생성 - dev
-      - name: Create docker-compose.yml file
-        if: contains(github.ref, 'develop')
-        run: |
-          echo "services:
-            maru-egg-app:
-              container_name: maru-egg
-              image: \${{ secrets.DOCKER_REPO }}:${{ steps.meta.outputs.tags }}-${{ github.run_number }}
-              ports:
-                - '8080:8080'
-              expose:
-                - '8080'" > docker-compose.yml
-        shell: bash
-
       # Gradle 패키지 캐시
       - name: Cache Gradle packages
         uses: actions/cache@v3
@@ -130,7 +116,17 @@ jobs:
           username: ${{ secrets.USERNAME }}
           key: ${{ secrets.PEM_KEY }}
           script: |
-            echo ${{ secrets.DOCKER_PASSWORD }} | sudo docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+            cd /home/${{ secrets.USERNAME }}
+            echo "services:
+                  maru-egg-app:
+                    container_name: maru-egg
+                    image: \${{ secrets.DOCKER_REPO }}:${{ steps.meta.outputs.tags }}-${{ github.run_number }}
+                    ports:
+                      - "8080:8080"
+                    expose:
+                      - "8080"
+                  " > docker-compose.yml
+            sudo docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
             if [ "$(sudo docker ps -q)" ]; then sudo docker stop $(sudo docker ps -q); fi
             if [ "$(sudo docker ps -a -q)" ]; then sudo docker rm $(sudo docker ps -a -q); fi
             sudo docker pull ${{ secrets.DOCKER_REPO }}:${{ steps.meta.outputs.tags }}-${{ github.run_number }}