From 97287c2fde7358afb58dc19160f952b5a69d4cb6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 May 2025 13:15:12 +0000 Subject: [PATCH 1/7] Created branch for issue #98 [skip ci] From 40413dd3acd0d34af97be7e8967f8795ca677e50 Mon Sep 17 00:00:00 2001 From: wsk0715 Date: Fri, 30 May 2025 22:15:49 +0900 Subject: [PATCH 2/7] =?UTF-8?q?cicd=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.ts b/src/main.ts index 25fced3..76a3a54 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,3 +7,5 @@ async function bootstrap() { } bootstrap(); + +// 코드 수정 From ac94f18dd3415f9c4721396f29b05768d6d133de Mon Sep 17 00:00:00 2001 From: wsk0715 Date: Fri, 30 May 2025 22:19:14 +0900 Subject: [PATCH 3/7] =?UTF-8?q?cicd=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nest-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nest-ci.yml b/.github/workflows/nest-ci.yml index b8b7389..3d18663 100644 --- a/.github/workflows/nest-ci.yml +++ b/.github/workflows/nest-ci.yml @@ -40,7 +40,7 @@ jobs: # Docker-Compose 빌드 - name: Docker Compose Build - run: docker-compose -f docker/docker-compose.yml build + run: docker compose -f docker/docker-compose.yml build env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} APP_NAME: ${{ github.event.repository.name }} From 51bda4d6310564b5ec7577256434caf8b0a31911 Mon Sep 17 00:00:00 2001 From: wsk0715 Date: Fri, 30 May 2025 22:20:20 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EC=98=A4=ED=83=80=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] --- .github/workflows/nest-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nest-ci.yml b/.github/workflows/nest-ci.yml index 3d18663..8f5de0e 100644 --- a/.github/workflows/nest-ci.yml +++ b/.github/workflows/nest-ci.yml @@ -30,7 +30,7 @@ jobs: run: npm run lint # 테스트 실행 - - name: Rrun test + - name: Run test run: npm run test # DockerHub 로그인 From faab04a314ce55ad969ae7124883bb3d919c37c6 Mon Sep 17 00:00:00 2001 From: wsk0715 Date: Fri, 30 May 2025 22:22:24 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EA=B6=8C=ED=95=9C=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nest-cd.yml | 12 ++++++------ .github/workflows/nest-ci.yml | 6 +++--- docker/docker-compose.yml | 2 -- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/nest-cd.yml b/.github/workflows/nest-cd.yml index b78c415..b8dde39 100644 --- a/.github/workflows/nest-cd.yml +++ b/.github/workflows/nest-cd.yml @@ -20,26 +20,26 @@ jobs: # DockerHub 로그인 - name: Docker login run: | - echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin + echo "${{ secrets.DOCKERHUB_PASSWORD }}" | sudo docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin # 최신 이미지 pull - name: Pull image - run: docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:main + run: sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:main # 기존 컨테이너 종료 및 제거 - name: Stop and remove existing container run: | - docker stop ${{ github.event.repository.name }} || true - docker rm ${{ github.event.repository.name }} || true + sudo docker stop ${{ github.event.repository.name }} || true + sudo docker rm ${{ github.event.repository.name }} || true # 새 컨테이너 실행 - name: Run container run: | - docker run -d \ + sudo docker run -d \ --name ${{ github.event.repository.name }} \ -p ${{ secrets.DOCKER_PORT_DEV }}:3000 \ ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:main # 안 쓰는 이미지 정리 - name: Prune unused images - run: docker image prune -af + run: sudo docker image prune -af diff --git a/.github/workflows/nest-ci.yml b/.github/workflows/nest-ci.yml index 8f5de0e..2970bef 100644 --- a/.github/workflows/nest-ci.yml +++ b/.github/workflows/nest-ci.yml @@ -36,11 +36,11 @@ jobs: # DockerHub 로그인 - name: Docker login run: | - echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin + echo "${{ secrets.DOCKERHUB_PASSWORD }}" | sudo docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin # Docker-Compose 빌드 - name: Docker Compose Build - run: docker compose -f docker/docker-compose.yml build + run: sudo docker compose -f docker/docker-compose.yml build env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} APP_NAME: ${{ github.event.repository.name }} @@ -50,4 +50,4 @@ jobs: # Docker 이미지 푸시 - name: Docker push - run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:main + run: sudo docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:main diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 641ccd2..149c18e 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: app: image: ${DOCKERHUB_USERNAME}/${APP_NAME}:main From e9f69207a8c364ac25a6ed25f3bb98a88ec95854 Mon Sep 17 00:00:00 2001 From: wsk0715 Date: Fri, 30 May 2025 22:24:37 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nest-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nest-ci.yml b/.github/workflows/nest-ci.yml index 2970bef..d69be61 100644 --- a/.github/workflows/nest-ci.yml +++ b/.github/workflows/nest-ci.yml @@ -36,7 +36,7 @@ jobs: # DockerHub 로그인 - name: Docker login run: | - echo "${{ secrets.DOCKERHUB_PASSWORD }}" | sudo docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin + echo "${{ secrets.DOCKERHUB_PASSWORD }}" | sudo -E docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin # Docker-Compose 빌드 - name: Docker Compose Build From 27db6cb7d4139a9c40ff19fb3dca8c31a382359a Mon Sep 17 00:00:00 2001 From: wsk0715 Date: Fri, 30 May 2025 22:28:38 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/nest-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nest-ci.yml b/.github/workflows/nest-ci.yml index d69be61..a700275 100644 --- a/.github/workflows/nest-ci.yml +++ b/.github/workflows/nest-ci.yml @@ -40,7 +40,7 @@ jobs: # Docker-Compose 빌드 - name: Docker Compose Build - run: sudo docker compose -f docker/docker-compose.yml build + run: sudo -E docker compose -f docker/docker-compose.yml build env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} APP_NAME: ${{ github.event.repository.name }} @@ -50,4 +50,4 @@ jobs: # Docker 이미지 푸시 - name: Docker push - run: sudo docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:main + run: sudo -E docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:main