From da8bd0c18e2db1c5864fc8b58efc1eeab8bfc007 Mon Sep 17 00:00:00 2001 From: yujamint Date: Thu, 27 Jun 2024 23:11:48 +0900 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20docker=20build=20tag=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 9b0ee17..4e060f1 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,9 +1,11 @@ name: deploy on: - pull_request: - branches: [dev] - types: [closed] +# pull_request: +# branches: [dev] +# types: [closed] + push: + branches: [refactor/cd-flow] jobs: deploy: @@ -42,7 +44,7 @@ jobs: with: context: . push: true - tags: ${{ secrets.DOCKER_USERNAME }}/qtudy-server:latest + tags: ${{ steps.meta.outputs.tags }} - name: EC2 서버에 배포 uses: appleboy/ssh-action@master From 19060a64c1776e6b6aa621b58dd76241081a0330 Mon Sep 17 00:00:00 2001 From: yujamint Date: Thu, 27 Jun 2024 23:12:49 +0900 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20docker=20build=20tag=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 4e060f1..f860f57 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -11,7 +11,7 @@ jobs: deploy: runs-on: ubuntu-latest - if: github.event.pull_request.merged +# if: github.event.pull_request.merged steps: - name: 체크아웃 From 84fe8b9922d53ad036b3dad491665c56ab154ee3 Mon Sep 17 00:00:00 2001 From: yujamint Date: Thu, 27 Jun 2024 23:15:55 +0900 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20docker=20build=20tag=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index f860f57..b91e8b5 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -44,7 +44,7 @@ jobs: with: context: . push: true - tags: ${{ steps.meta.outputs.tags }} + tags: ${{ secrets.DOCKERHUB_USERNAME }}/qtudy-server:${{ github.sha }} - name: EC2 서버에 배포 uses: appleboy/ssh-action@master From 0236ceecc8395d2214c50b45880bc4051150ecb4 Mon Sep 17 00:00:00 2001 From: yujamint Date: Thu, 27 Jun 2024 23:33:41 +0900 Subject: [PATCH 4/9] =?UTF-8?q?feat:=20Dockerfile=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yaml | 4 ---- Dockerfile | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 Dockerfile diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index b91e8b5..5b1ae79 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,9 +1,6 @@ name: deploy on: -# pull_request: -# branches: [dev] -# types: [closed] push: branches: [refactor/cd-flow] @@ -11,7 +8,6 @@ jobs: deploy: runs-on: ubuntu-latest -# if: github.event.pull_request.merged steps: - name: 체크아웃 diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..455c6e8 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM amazoncorretto:11-alpine-jdk +EXPOSE 8080 +COPY ./build/libs/Qtudy-server-0.0.1-SNAPSHOT.jar /app.jar +CMD ["java", "-jar", "app.jar", "--spring.profiles.active=stage"] From 0474bb7afaaf71c1ae6b2003a24ab6c0edd76dcb Mon Sep 17 00:00:00 2001 From: yujamint Date: Thu, 27 Jun 2024 23:50:41 +0900 Subject: [PATCH 5/9] =?UTF-8?q?feat:=20pull=20=ED=83=9C=EA=B7=B8=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/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 5b1ae79..438d272 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -51,6 +51,6 @@ jobs: envs: GITHUB_SHA script: | sudo docker stop $(sudo docker ps -a -q) - sudo docker pull ${{secrets.DOCKER_USERNAME}}/qtudy-server + sudo docker pull ${{secrets.DOCKER_USERNAME}}/qtudy-server:${{ github.sha }} sudo docker run -d -p 8080:8080 --name qtudy-server-container ${{secrets.DOCKER_USERNAME}}/qtudy-server sudo docker image prune -f From 2fcbf1aed909f0c46c0d11057bb5a3160266f881 Mon Sep 17 00:00:00 2001 From: yujamint Date: Fri, 28 Jun 2024 00:05:11 +0900 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20docker=20build=20tag=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 438d272..192491b 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -40,7 +40,7 @@ jobs: with: context: . push: true - tags: ${{ secrets.DOCKERHUB_USERNAME }}/qtudy-server:${{ github.sha }} + tags: ${{ secrets.DOCKERHUB_USERNAME }}/qtudy-server:latest - name: EC2 서버에 배포 uses: appleboy/ssh-action@master @@ -51,6 +51,6 @@ jobs: envs: GITHUB_SHA script: | sudo docker stop $(sudo docker ps -a -q) - sudo docker pull ${{secrets.DOCKER_USERNAME}}/qtudy-server:${{ github.sha }} + sudo docker pull ${{secrets.DOCKER_USERNAME}}/qtudy-server sudo docker run -d -p 8080:8080 --name qtudy-server-container ${{secrets.DOCKER_USERNAME}}/qtudy-server sudo docker image prune -f From 07872c5d16d73ccca63f2c58869c2f85b9cbfa29 Mon Sep 17 00:00:00 2001 From: yujamint Date: Fri, 28 Jun 2024 10:04:04 +0900 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=EC=9E=98=EB=AA=BB=EB=90=9C=20secret?= =?UTF-8?q?s=20variable=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 192491b..937b7db 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -51,6 +51,6 @@ jobs: envs: GITHUB_SHA script: | sudo docker stop $(sudo docker ps -a -q) - sudo docker pull ${{secrets.DOCKER_USERNAME}}/qtudy-server - sudo docker run -d -p 8080:8080 --name qtudy-server-container ${{secrets.DOCKER_USERNAME}}/qtudy-server + sudo docker pull ${{secrets.DOCKERHUB_USERNAME}}/qtudy-server + sudo docker run -d -p 8080:8080 --name qtudy-server-container ${{secrets.DOCKERHUB_USERNAME}}/qtudy-server sudo docker image prune -f From 86bb35709952cec86ba89b87776e485bb0da0617 Mon Sep 17 00:00:00 2001 From: yujamint Date: Fri, 28 Jun 2024 10:07:58 +0900 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20docker=20container=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EC=BB=A4=EB=A7=A8=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 937b7db..5bff3a9 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -51,6 +51,7 @@ jobs: envs: GITHUB_SHA script: | sudo docker stop $(sudo docker ps -a -q) + sudo docker rm $(sudo docker ps -a -q) sudo docker pull ${{secrets.DOCKERHUB_USERNAME}}/qtudy-server sudo docker run -d -p 8080:8080 --name qtudy-server-container ${{secrets.DOCKERHUB_USERNAME}}/qtudy-server sudo docker image prune -f From 29870038519f6e6e47d18f90379dcc26f6e519c0 Mon Sep 17 00:00:00 2001 From: yujamint Date: Fri, 28 Jun 2024 10:14:08 +0900 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20trigger=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 5bff3a9..876f770 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -2,7 +2,7 @@ name: deploy on: push: - branches: [refactor/cd-flow] + branches: [dev] jobs: deploy: