From 4047264d80dd3cfd967587ca37210deff074cbc0 Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Fri, 4 Oct 2024 16:56:44 +0900 Subject: [PATCH 1/9] =?UTF-8?q?refactor:=20=EC=BB=A4=EB=B0=8B=20=EC=8B=9C?= =?UTF-8?q?=EC=A0=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/src/main/resources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/pokerogue/src/main/resources b/backend/pokerogue/src/main/resources index 93fd3dfa..985453ee 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit 93fd3dfa20e6c1713afc37b159b6941c67821dc4 +Subproject commit 985453eefb017232bc289886acea1f0eb756d80f From 1a59ebcd1d4c355e6efbd1991a047073fb61681d Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Fri, 4 Oct 2024 17:00:37 +0900 Subject: [PATCH 2/9] =?UTF-8?q?refactor:=20=EC=BB=A4=EB=B0=8B=20=EC=8B=9C?= =?UTF-8?q?=EC=A0=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CD-Dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Backend-CD-Dev.yml b/.github/workflows/Backend-CD-Dev.yml index d5d31cc7..f5a75f93 100644 --- a/.github/workflows/Backend-CD-Dev.yml +++ b/.github/workflows/Backend-CD-Dev.yml @@ -2,7 +2,7 @@ name: Backend Development Server CD on: push: - branches: [ "be/develop" ] + branches: [ "sample-test" ] permissions: contents: read From cf00222ac26267a50292214e399eae31cc80d3e7 Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Fri, 4 Oct 2024 17:25:24 +0900 Subject: [PATCH 3/9] =?UTF-8?q?refactor:=20=EC=BB=A4=EB=B0=8B=20=EC=8B=9C?= =?UTF-8?q?=EC=A0=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/src/main/resources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/pokerogue/src/main/resources b/backend/pokerogue/src/main/resources index 985453ee..d5332cf0 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit 985453eefb017232bc289886acea1f0eb756d80f +Subproject commit d5332cf01656f1c7dc3e2986903bf615813e06ee From eab658e65cdf50c5e23bd114492cfc90121facab Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Fri, 4 Oct 2024 17:40:31 +0900 Subject: [PATCH 4/9] =?UTF-8?q?refactor:=20=EC=BB=A4=EB=B0=8B=20=EC=8B=9C?= =?UTF-8?q?=EC=A0=90=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/src/main/resources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/pokerogue/src/main/resources b/backend/pokerogue/src/main/resources index d5332cf0..7e521e30 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit d5332cf01656f1c7dc3e2986903bf615813e06ee +Subproject commit 7e521e3092128acfa3f6eed064db11677aef553b From 7d681a85093623f4beb61b5a8691407056115159 Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Fri, 4 Oct 2024 17:40:57 +0900 Subject: [PATCH 5/9] =?UTF-8?q?refactor:=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CD-Dev.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Backend-CD-Dev.yml b/.github/workflows/Backend-CD-Dev.yml index f5a75f93..3d935942 100644 --- a/.github/workflows/Backend-CD-Dev.yml +++ b/.github/workflows/Backend-CD-Dev.yml @@ -12,7 +12,6 @@ jobs: uses: ./.github/workflows/Backend-CI.yml secrets: inherit - build: needs: test runs-on: dev @@ -60,10 +59,15 @@ jobs: else echo "No containers to remove." fi - + + # Pull and run the MongoDB container + docker pull pokeroguehelper/pokerogue-helper-test-mongodb + docker run -d --name pokerogue-mongo-db pokeroguehelper/pokerogue-helper-test-mongodb + + # Pull and run the server container docker pull ${{ secrets.DOCKER_DEV_SERVER_IMAGE }} - docker run -d -p 8080:8080 --name server \ + --link pokerogue-mongo-db:mongo \ -e JAVA_OPTS="-XX:InitialRAMPercentage=70.0 -XX:MaxRAMPercentage=70.0" \ -e TZ=Asia/Seoul \ -e SPRING_PROFILES_ACTIVE=dev \ From 3b29ac7ace2681bc25562824bd790172adc7945f Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Fri, 4 Oct 2024 19:36:23 +0900 Subject: [PATCH 6/9] =?UTF-8?q?refactor:=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=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/Backend-CD-Dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Backend-CD-Dev.yml b/.github/workflows/Backend-CD-Dev.yml index 3d935942..ee6e7303 100644 --- a/.github/workflows/Backend-CD-Dev.yml +++ b/.github/workflows/Backend-CD-Dev.yml @@ -2,7 +2,7 @@ name: Backend Development Server CD on: push: - branches: [ "sample-test" ] + branches: [ "be/develop" ] permissions: contents: read From 28ff09b68ad8427328d82093e860e59fb731d132 Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Mon, 7 Oct 2024 16:10:36 +0900 Subject: [PATCH 7/9] =?UTF-8?q?refactor:=20secret=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EC=BA=90=EC=8B=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CD-Dev.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Backend-CD-Dev.yml b/.github/workflows/Backend-CD-Dev.yml index ee6e7303..a8b72d1f 100644 --- a/.github/workflows/Backend-CD-Dev.yml +++ b/.github/workflows/Backend-CD-Dev.yml @@ -55,19 +55,18 @@ jobs: sudo chmod 666 /var/run/docker.sock if [ "$(docker ps -qa)" ]; then - docker rm -f $(docker ps -qa) + docker rm -f $(docker ps -qa) + docker builder prune else - echo "No containers to remove." + echo "No containers to remove." fi - # Pull and run the MongoDB container - docker pull pokeroguehelper/pokerogue-helper-test-mongodb - docker run -d --name pokerogue-mongo-db pokeroguehelper/pokerogue-helper-test-mongodb + docker pull ${{ secrets.DOCKER_DEV_MONGO_IMAGE }} + docker run -d --name pokerogue-mongo-db ${{ secrets.DOCKER_DEV_MONGO_IMAGE }} - # Pull and run the server container docker pull ${{ secrets.DOCKER_DEV_SERVER_IMAGE }} docker run -d -p 8080:8080 --name server \ - --link pokerogue-mongo-db:mongo \ + --link pokerogue-mongo-db \ -e JAVA_OPTS="-XX:InitialRAMPercentage=70.0 -XX:MaxRAMPercentage=70.0" \ -e TZ=Asia/Seoul \ -e SPRING_PROFILES_ACTIVE=dev \ From 1cd343fee755f4382c709aa699e2942fc475bfc5 Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Fri, 11 Oct 2024 10:30:22 +0900 Subject: [PATCH 8/9] =?UTF-8?q?refactor:=20=EC=9D=B8=EB=8D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CD-Dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Backend-CD-Dev.yml b/.github/workflows/Backend-CD-Dev.yml index a8b72d1f..12b06209 100644 --- a/.github/workflows/Backend-CD-Dev.yml +++ b/.github/workflows/Backend-CD-Dev.yml @@ -55,10 +55,10 @@ jobs: sudo chmod 666 /var/run/docker.sock if [ "$(docker ps -qa)" ]; then - docker rm -f $(docker ps -qa) - docker builder prune + docker rm -f $(docker ps -qa) + docker builder prune else - echo "No containers to remove." + echo "No containers to remove." fi docker pull ${{ secrets.DOCKER_DEV_MONGO_IMAGE }} From 3b4611f601deca8066a2dde1dbbbbfcd187fd723 Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Fri, 11 Oct 2024 17:04:32 +0900 Subject: [PATCH 9/9] =?UTF-8?q?chore:=20=EC=84=9C=EB=B8=8C=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=EC=BB=A4=EB=B0=8B=20=EC=8B=9C=EC=A0=90=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/src/main/resources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/pokerogue/src/main/resources b/backend/pokerogue/src/main/resources index 7e521e30..8d0ded1d 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit 7e521e3092128acfa3f6eed064db11677aef553b +Subproject commit 8d0ded1d3b1d34ca75fb46c924b96bc6da71deb0