From 6f62c29d099c19323e5c4f7703564b327127f735 Mon Sep 17 00:00:00 2001 From: senna Date: Wed, 29 Jan 2025 15:51:51 +0900 Subject: [PATCH 1/6] =?UTF-8?q?chore:=20dev=20cd=20=ED=8C=8C=EC=9D=B4?= =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 5d884105..4882d908 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -59,7 +59,7 @@ jobs: with: host: ${{ secrets.DEV_SSH_SECRET_HOST }} username: ${{ secrets.DEV_SSH_SECRET_USER }} - port: 30922 + port: 22 key: ${{ secrets.DEV_SSH_SECRET_PRIVATE_KEY }} script: | docker pull ${{ secrets.DEV_DOCKER_USER_NAME }}/gachtaxi:latest From f94b6af3978ede308b3dd76c30f87d085798225b Mon Sep 17 00:00:00 2001 From: senna Date: Wed, 29 Jan 2025 15:53:10 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20?= =?UTF-8?q?=EC=9C=84=ED=95=B4=20deploy=20=ED=8A=B8=EB=A6=AC=EA=B1=B0=20?= =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 4882d908..51faf78a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -50,7 +50,7 @@ jobs: deploy: runs-on: ubuntu-latest needs: build - if: github.event_name == 'push' +# if: github.event_name == 'push' steps: # SSH를 사용하여 원격 서버에 배포 From cdbe20588fa133059ffc50b40989a1f0643e9761 Mon Sep 17 00:00:00 2001 From: senna Date: Wed, 29 Jan 2025 15:54:09 +0900 Subject: [PATCH 3/6] test --- .github/workflows/dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 51faf78a..4e34444d 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -2,9 +2,9 @@ name: GachTaxi-BE dev CI/CD on: push: - branches: [ "dev" ] # develop 브랜치에 push 시 트리거 + branches: [ "dev" , "feat/#57/OCICICD파이프라인구축"] # develop 브랜치에 push 시 트리거 pull_request: - branches: [ "dev" ] # develop 브랜치에 대한 PR 시 트리거 + branches: [ "dev", "feat/#57/OCICICD파이프라인구축" ] # develop 브랜치에 대한 PR 시 트리거 types: [opened, synchronize, reopened] jobs: From b0de51eafd53ebc814ba4d1b0d67d77c4ef75891 Mon Sep 17 00:00:00 2001 From: senna Date: Wed, 29 Jan 2025 16:04:55 +0900 Subject: [PATCH 4/6] =?UTF-8?q?chore:=20dev=20cd=EC=97=90=20sudo=20su=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 4e34444d..4e84882d 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -62,10 +62,12 @@ jobs: port: 22 key: ${{ secrets.DEV_SSH_SECRET_PRIVATE_KEY }} script: | + sudo su docker pull ${{ secrets.DEV_DOCKER_USER_NAME }}/gachtaxi:latest docker compose up -d --no-deps gachtaxi # 사용하지 않는 이미지 정리 echo "** 사용하지 않는 Docker 이미지 정리" - echo "${{ secrets.DEV_SSH_SECRET_PASSWORD }}" | sudo docker image prune -f \ No newline at end of file +# echo "${{ secrets.DEV_SSH_SECRET_PASSWORD }}" | sudo docker image prune -f + sudo docker image prune -f \ No newline at end of file From a20649552cb95cff15ec0a8a5e43ed9b576566ce Mon Sep 17 00:00:00 2001 From: senna Date: Wed, 29 Jan 2025 16:10:12 +0900 Subject: [PATCH 5/6] =?UTF-8?q?chore:=20=EB=AA=A8=EB=93=A0=20=EB=AA=85?= =?UTF-8?q?=EB=A0=B9=EC=96=B4=EC=97=90=20sudo=20=EB=AA=85=EB=A0=B9?= =?UTF-8?q?=EC=96=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 4e84882d..bf449a5a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -62,10 +62,9 @@ jobs: port: 22 key: ${{ secrets.DEV_SSH_SECRET_PRIVATE_KEY }} script: | - sudo su - docker pull ${{ secrets.DEV_DOCKER_USER_NAME }}/gachtaxi:latest + sudo docker pull ${{ secrets.DEV_DOCKER_USER_NAME }}/gachtaxi:latest - docker compose up -d --no-deps gachtaxi + sudo docker compose up -d --no-deps gachtaxi # 사용하지 않는 이미지 정리 echo "** 사용하지 않는 Docker 이미지 정리" From d62b744a706895ff03a089105f1e08ce56cb7159 Mon Sep 17 00:00:00 2001 From: senna Date: Wed, 29 Jan 2025 16:10:51 +0900 Subject: [PATCH 6/6] =?UTF-8?q?chore:=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=EB=82=B4=EB=B6=80=EC=9D=98=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index bf449a5a..a5bd736d 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -68,5 +68,4 @@ jobs: # 사용하지 않는 이미지 정리 echo "** 사용하지 않는 Docker 이미지 정리" -# echo "${{ secrets.DEV_SSH_SECRET_PASSWORD }}" | sudo docker image prune -f sudo docker image prune -f \ No newline at end of file