From b403471292087f82d3b679ffc507f47e14f3170b Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Sat, 17 Aug 2024 01:49:12 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[fix]=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=ED=91=B8=EC=8B=9C=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EB=B0=8F=20=EB=8F=84=EC=BB=A4=ED=97=88=EB=B8=8C=20=EB=A0=88?= =?UTF-8?q?=ED=8F=AC=EC=A7=80=ED=86=A0=EB=A6=AC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml index f24d3252..1e5aba77 100644 --- a/.github/workflows/dev-ci.yml +++ b/.github/workflows/dev-ci.yml @@ -46,5 +46,4 @@ jobs: - name: Docker build & push to dockerhub run: | - docker build -f Dockerfile -t minchogt/farmus-spring . - docker push minchogt/farmus-spring \ No newline at end of file + docker build -f Dockerfile -t modernfarmer/farmus-spring . \ No newline at end of file From 555d8e518b9e377d5b145cbce45ec0a24912d288 Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Sat, 17 Aug 2024 03:48:44 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[fix]=20=EB=8F=84=EC=BB=A4=ED=97=88?= =?UTF-8?q?=EB=B8=8C=20=EB=A0=88=ED=8F=AC=EC=A7=80=ED=86=A0=EB=A6=AC=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-cicd.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dev-cicd.yml b/.github/workflows/dev-cicd.yml index 9a1bda6a..2f640c16 100644 --- a/.github/workflows/dev-cicd.yml +++ b/.github/workflows/dev-cicd.yml @@ -2,7 +2,7 @@ name: cicd for development on: push: - branches: [ "dev" ] + branches: [ "dev", "fix_82/클라우드-이전" ] jobs: build: @@ -46,9 +46,8 @@ jobs: - name: Docker build & push to dockerhub run: | - docker build -f Dockerfile -t minchogt/farmus-spring . - docker push minchogt/farmus-spring -# docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD + docker build -f Dockerfile -t modernfarmer/farmus-spring . + docker push modernfarmer/farmus-spring deploy: needs: build @@ -69,6 +68,6 @@ jobs: key: ${{ secrets.SSH_PRIVATE_KEY }} envs: GITHUB_SHA script: | - sudo docker pull minchogt/farmus-spring + sudo docker pull modernfarmer/farmus-spring ./deploy.sh docker image prune -f From 2f6ff6ab70fc7e320b693df6e084c4910ab73406 Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Sat, 17 Aug 2024 23:41:11 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[fix]=20=EB=B0=B0=ED=8F=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=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-cicd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev-cicd.yml b/.github/workflows/dev-cicd.yml index 2f640c16..53d67cc7 100644 --- a/.github/workflows/dev-cicd.yml +++ b/.github/workflows/dev-cicd.yml @@ -69,5 +69,6 @@ jobs: envs: GITHUB_SHA script: | sudo docker pull modernfarmer/farmus-spring + cd docker-compose ./deploy.sh docker image prune -f From e21766804e8b457be05760ecab77c12a2504f61d Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Sat, 17 Aug 2024 23:49:52 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[fix]=20=EB=B0=B0=ED=8F=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=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-cicd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-cicd.yml b/.github/workflows/dev-cicd.yml index 53d67cc7..60437459 100644 --- a/.github/workflows/dev-cicd.yml +++ b/.github/workflows/dev-cicd.yml @@ -70,5 +70,5 @@ jobs: script: | sudo docker pull modernfarmer/farmus-spring cd docker-compose - ./deploy.sh + bash deploy.sh docker image prune -f