From 9eac54ae9bfb83e9444c621acd03d9f324a5cb34 Mon Sep 17 00:00:00 2001 From: jongmee Date: Mon, 15 Jul 2024 20:54:39 +0900 Subject: [PATCH 01/32] =?UTF-8?q?chore:=20db=20=EC=84=9C=EB=B2=84=20url=20?= =?UTF-8?q?=EC=84=A4=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 9cdef5785..b9d92cce4 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit 9cdef57854f253e41c63f2d213658d1977d15efa +Subproject commit b9d92cce4ad9720feba01dcf8d55538129e75040 From 251dad6af469895c425d8f331ec642401d988afc Mon Sep 17 00:00:00 2001 From: jongmee Date: Mon, 15 Jul 2024 21:42:23 +0900 Subject: [PATCH 02/32] =?UTF-8?q?build:=20dev=EC=9A=A9=20h2=20db=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/build.gradle | 3 +++ backend/pokerogue/src/main/resources | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/pokerogue/build.gradle b/backend/pokerogue/build.gradle index 83eec08b1..e23860d9e 100644 --- a/backend/pokerogue/build.gradle +++ b/backend/pokerogue/build.gradle @@ -37,6 +37,9 @@ dependencies { // mySql runtimeOnly 'com.mysql:mysql-connector-j' + // H2 + runtimeOnly 'com.h2database:h2' + // JPA implementation 'org.springframework.boot:spring-boot-starter-data-jpa' diff --git a/backend/pokerogue/src/main/resources b/backend/pokerogue/src/main/resources index b9d92cce4..4b9ed1c84 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit b9d92cce4ad9720feba01dcf8d55538129e75040 +Subproject commit 4b9ed1c8478b7d92836888e15726a5ae8ec5f47d From edcc26bd549bc8c9f36052969da348ff99db0503 Mon Sep 17 00:00:00 2001 From: jongmee Date: Tue, 16 Jul 2024 11:16:28 +0900 Subject: [PATCH 03/32] =?UTF-8?q?chore:=20dev=20=EC=84=9C=EB=B2=84=20db?= =?UTF-8?q?=EB=A5=BC=20mysql=EB=A1=9C=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 4b9ed1c84..e46edb643 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit 4b9ed1c8478b7d92836888e15726a5ae8ec5f47d +Subproject commit e46edb643187a85ab4c9b73386fd94076fe2a29b From 8b7f44a0315c81725bbc1286f10424f6eb3ed961 Mon Sep 17 00:00:00 2001 From: jongmee Date: Tue, 16 Jul 2024 13:29:45 +0900 Subject: [PATCH 04/32] =?UTF-8?q?chore:=20local=20mysql=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= 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 e46edb643..c3d20fa34 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit e46edb643187a85ab4c9b73386fd94076fe2a29b +Subproject commit c3d20fa34bb50d5a5bccfd99797ed8f3c4f7f9e6 From f15c2bf51bf00e67f5d86990e67562ed20101fe9 Mon Sep 17 00:00:00 2001 From: jongmee Date: Wed, 17 Jul 2024 16:12:11 +0900 Subject: [PATCH 05/32] =?UTF-8?q?ci:=20ci=20script=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CI.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/Backend-CI.yml diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml new file mode 100644 index 000000000..a9ded850f --- /dev/null +++ b/.github/workflows/Backend-CI.yml @@ -0,0 +1,30 @@ +name: Backend CI + +on: + pull_request: + branches: [ "be/develop" ] + push: + branches: [ "be/develop" ] + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + steps: + + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + + - name: Run Test + run: ./gradlew clean test + + - name: Build with Gradle + run: ./gradlew bootJar From 89acd8ab58d2c4392cab73a3d04776ab143babf8 Mon Sep 17 00:00:00 2001 From: jongmee Date: Wed, 17 Jul 2024 16:21:06 +0900 Subject: [PATCH 06/32] =?UTF-8?q?ci:=20ci=20script=EC=97=90=20working-dire?= =?UTF-8?q?ctory=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CI.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index a9ded850f..8e96746bf 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -11,6 +11,8 @@ permissions: jobs: build: + env: + working-directory: ./backend/pokerogue runs-on: ubuntu-latest steps: @@ -25,6 +27,8 @@ jobs: - name: Run Test run: ./gradlew clean test + working-directory: ${{ env.working-directory }} - name: Build with Gradle run: ./gradlew bootJar + working-directory: ${{ env.working-directory }} From 1ed7ff789dd8e34c6b303dddee7515c8f5aff1b5 Mon Sep 17 00:00:00 2001 From: jongmee Date: Wed, 17 Jul 2024 17:52:42 +0900 Subject: [PATCH 07/32] =?UTF-8?q?chore:=20Nginx=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pokerogue/docker/nginx/conf.d/nginx.conf | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 backend/pokerogue/docker/nginx/conf.d/nginx.conf diff --git a/backend/pokerogue/docker/nginx/conf.d/nginx.conf b/backend/pokerogue/docker/nginx/conf.d/nginx.conf new file mode 100644 index 000000000..52a05fc93 --- /dev/null +++ b/backend/pokerogue/docker/nginx/conf.d/nginx.conf @@ -0,0 +1,74 @@ +server { + listen [::]:80 default_server; + root /var/www/html; + server_name _; + + location / { + proxy_pass http://localhost:8080; + proxy_set_header X-Real_IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + } +} + +server { + root /var/www/html; + server_name pokerogue-helper.com; + + location / { + proxy_pass http://localhost:8080; + proxy_set_header X-Real_IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + } + + listen [::]:443 ssl ipv6only=on; + listen 443 ssl; + ssl_certificate /etc/letsencrypt/live/pokerogue-helper.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/pokerogue-helper.com/privkey.pem; + include /etc/letsencrypt/options-ssl-nginx.conf; + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; +} + +server { + if ($host = pokerogue-helper.com) { + return 301 https://$host$request_uri; + } + + listen 80 ; + listen [::]:80 ; + server_name pokerogue-helper.com; + return 404; +} + +server { + root /var/www/html; + index index.html index.htm index.nginx-debian.html; + server_name back.pokerogue-helper.com; + + location / { + proxy_pass http://localhost:8080; + proxy_set_header X-Real_IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + } + + listen [::]:443 ssl; + listen 443 ssl; + ssl_certificate /etc/letsencrypt/live/back.pokerogue-helper.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/back.pokerogue-helper.com/privkey.pem; + include /etc/letsencrypt/options-ssl-nginx.conf; + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; + +} + +server { + if ($host = back.pokerogue-helper.com) { + return 301 https://$host$request_uri; + } + + listen 80 ; + listen [::]:80 ; + server_name back.pokerogue-helper.com; + return 404; +} From c4c1d0f17ba5bbc790a582ee3db9e299360b6986 Mon Sep 17 00:00:00 2001 From: jongmee Date: Wed, 17 Jul 2024 17:53:26 +0900 Subject: [PATCH 08/32] =?UTF-8?q?chore:=20=EC=84=9C=EB=B2=84=20&=20nginx?= =?UTF-8?q?=20Dockerfile=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/docker/Dockerfile | 4 ++++ backend/pokerogue/docker/Dockerfile-nginx | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 backend/pokerogue/docker/Dockerfile create mode 100644 backend/pokerogue/docker/Dockerfile-nginx diff --git a/backend/pokerogue/docker/Dockerfile b/backend/pokerogue/docker/Dockerfile new file mode 100644 index 000000000..078d0c298 --- /dev/null +++ b/backend/pokerogue/docker/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:17 +ARG JAR_FILE=/build/libs/*.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java","-jar", "/app.jar"] diff --git a/backend/pokerogue/docker/Dockerfile-nginx b/backend/pokerogue/docker/Dockerfile-nginx new file mode 100644 index 000000000..e20000b51 --- /dev/null +++ b/backend/pokerogue/docker/Dockerfile-nginx @@ -0,0 +1,4 @@ +FROM nginx +RUN rm -rf /etc/nginx/conf.d/default.conf +COPY ./nginx/conf.d/nginx.conf /etc/nginx/conf.d +CMD ["nginx", "-g", "daemon off;"] From d275960a8f622f7049f75ec8cbc6e3c8ffa59c31 Mon Sep 17 00:00:00 2001 From: jongmee Date: Wed, 17 Jul 2024 17:54:04 +0900 Subject: [PATCH 09/32] =?UTF-8?q?chore:=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=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CI.yml | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index 8e96746bf..c2ded4ce3 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -13,11 +13,15 @@ jobs: build: env: working-directory: ./backend/pokerogue + docker-directory: ./backend/pokerogue/docker runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 + with: + token: ${{ secrets.ACTION_TOKEN }} + submodules: true - name: Set up JDK 17 uses: actions/setup-java@v3 @@ -32,3 +36,36 @@ jobs: - name: Build with Gradle run: ./gradlew bootJar working-directory: ${{ env.working-directory }} + + - name: Docker build and push + working-directory: ${{ env.docker-directory }} + run: | + docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + + docker build -t ${{ secrets.DOCKER_SERVER_IMAGE }} . + docker push ${{ secrets.DOCKER_SERVER_IMAGE }} + + docker build -f dockerfile-nginx -t ${{ secrets.DOCKER_NGINX_IMAGE }} . + docker push ${{ secrets.DOCKER_NGINX_IMAGE }} + + - name: Deploy + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ubuntu + key: ${{ secrets.KEY }} + script: | + cd /home/ubuntu + + sudo touch docker-compose.yml + echo "${{ vars.DOCKER_COMPOSE }}" | sudo tee docker-compose.yml > /dev/null + + sudo chmod 666 /var/run/docker.sock + + sudo docker rm -f $(docker ps -qa) + + sudo docker pull ${{ secrets.DOCKER_SERVER_IMAGE }} + sudo docker pull ${{ secrets.DOCKER_NGINX_IMAGE }} + + docker-compose -f docker-compose.yml up -d + docker image prune -f From 3ab164934f0d5066b8e9af5f31f59defcca76824 Mon Sep 17 00:00:00 2001 From: jongmee Date: Wed, 17 Jul 2024 21:09:39 +0900 Subject: [PATCH 10/32] =?UTF-8?q?chore:=20=EA=B0=9C=EB=B0=9C=20=EC=84=9C?= =?UTF-8?q?=EB=B2=84=20mysql=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= 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 c3d20fa34..f19030b70 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit c3d20fa34bb50d5a5bccfd99797ed8f3c4f7f9e6 +Subproject commit f19030b70cb3401cfd1b0d6db766805430d4ee7b From 4d032322077b4a73c5699a688dfeca6570514e69 Mon Sep 17 00:00:00 2001 From: jongmee Date: Wed, 17 Jul 2024 21:15:19 +0900 Subject: [PATCH 11/32] =?UTF-8?q?chore:=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=EC=97=90=EC=84=9C=20jar=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/pokerogue/docker/Dockerfile b/backend/pokerogue/docker/Dockerfile index 078d0c298..16a9d51fa 100644 --- a/backend/pokerogue/docker/Dockerfile +++ b/backend/pokerogue/docker/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:17 -ARG JAR_FILE=/build/libs/*.jar +ARG JAR_FILE=../build/libs/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["java","-jar", "/app.jar"] From 1e01719cd939a9ab2972b264a8af700e1c390394 Mon Sep 17 00:00:00 2001 From: jongmee Date: Wed, 17 Jul 2024 21:15:19 +0900 Subject: [PATCH 12/32] =?UTF-8?q?chore:=20jar=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=A0=88=EB=8C=80=20=EA=B2=BD=EB=A1=9C?= =?UTF-8?q?=EB=A1=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/Backend-CI.yml | 7 +++---- backend/pokerogue/docker/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index c2ded4ce3..85d11a1e4 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -38,14 +38,13 @@ jobs: working-directory: ${{ env.working-directory }} - name: Docker build and push - working-directory: ${{ env.docker-directory }} run: | docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - - docker build -t ${{ secrets.DOCKER_SERVER_IMAGE }} . + + docker build -t ${{ secrets.DOCKER_SERVER_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile ./backend/pokerogue docker push ${{ secrets.DOCKER_SERVER_IMAGE }} - docker build -f dockerfile-nginx -t ${{ secrets.DOCKER_NGINX_IMAGE }} . + docker build -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue docker push ${{ secrets.DOCKER_NGINX_IMAGE }} - name: Deploy diff --git a/backend/pokerogue/docker/Dockerfile b/backend/pokerogue/docker/Dockerfile index 16a9d51fa..82fa69687 100644 --- a/backend/pokerogue/docker/Dockerfile +++ b/backend/pokerogue/docker/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:17 -ARG JAR_FILE=../build/libs/*.jar +ARG JAR_FILE=/backend/pokerogue/build/libs/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["java","-jar", "/app.jar"] From 0e25e6d1d5733c2e1476a1d2024c8f39a2f07e2f Mon Sep 17 00:00:00 2001 From: jongmee Date: Wed, 17 Jul 2024 23:54:08 +0900 Subject: [PATCH 13/32] =?UTF-8?q?chore:=20=EB=B9=8C=EB=93=9C=20=EC=BB=A8?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=EC=97=90=20=EB=A7=9E=EA=B2=8C=20doc?= =?UTF-8?q?kerfile=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/pokerogue/docker/Dockerfile b/backend/pokerogue/docker/Dockerfile index 82fa69687..078d0c298 100644 --- a/backend/pokerogue/docker/Dockerfile +++ b/backend/pokerogue/docker/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:17 -ARG JAR_FILE=/backend/pokerogue/build/libs/*.jar +ARG JAR_FILE=/build/libs/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["java","-jar", "/app.jar"] From a28260cf44a62083751c2873cec371d6f17ecc25 Mon Sep 17 00:00:00 2001 From: jongmee Date: Wed, 17 Jul 2024 23:58:58 +0900 Subject: [PATCH 14/32] =?UTF-8?q?chore:=20nginx=20=EB=8F=84=EC=BB=A4=20?= =?UTF-8?q?=EB=B9=8C=EB=93=9C=20=EC=BB=A8=ED=85=8D=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/Backend-CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index 85d11a1e4..4b30c1ee6 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -44,7 +44,7 @@ jobs: docker build -t ${{ secrets.DOCKER_SERVER_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile ./backend/pokerogue docker push ${{ secrets.DOCKER_SERVER_IMAGE }} - docker build -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue + docker build -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue/docker docker push ${{ secrets.DOCKER_NGINX_IMAGE }} - name: Deploy From 86c225f4d2bc48d0771b3b7ac5f96a36a3b6b938 Mon Sep 17 00:00:00 2001 From: jongmee Date: Thu, 18 Jul 2024 10:50:57 +0900 Subject: [PATCH 15/32] =?UTF-8?q?chore:=20self=20hosted=20runner=20?= =?UTF-8?q?=EB=8F=84=EC=9E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CI.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index 4b30c1ee6..6de1dd44f 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -14,9 +14,13 @@ jobs: env: working-directory: ./backend/pokerogue docker-directory: ./backend/pokerogue/docker - runs-on: ubuntu-latest + runs-on: self-hosted steps: + - name: Change permission + run: | + sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/_work/2024-pokerogue-helper + - name: Checkout uses: actions/checkout@v3 with: From ef6e1f3583baf54dd612c71e9b8f29ce088371ab Mon Sep 17 00:00:00 2001 From: jongmee Date: Thu, 18 Jul 2024 17:24:54 +0900 Subject: [PATCH 16/32] =?UTF-8?q?chore:=20mysql=20=EC=84=9C=EB=B2=84=20ip?= =?UTF-8?q?=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 f19030b70..ea57f9955 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit f19030b70cb3401cfd1b0d6db766805430d4ee7b +Subproject commit ea57f995506076e60c01d4a13c210e50d80d7c00 From 4492c737dde58d31e10789e8d7f4ed10d78dbff3 Mon Sep 17 00:00:00 2001 From: jongmee Date: Thu, 18 Jul 2024 17:33:51 +0900 Subject: [PATCH 17/32] =?UTF-8?q?chore:=20appleboy=20=EB=B2=84=EC=A0=84=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/Backend-CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index 6de1dd44f..cc5204a8e 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -52,7 +52,7 @@ jobs: docker push ${{ secrets.DOCKER_NGINX_IMAGE }} - name: Deploy - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v0.1.9 with: host: ${{ secrets.HOST }} username: ubuntu From 805ab4c81c05a2749818ebe0bb6db5946ece3298 Mon Sep 17 00:00:00 2001 From: jongmee Date: Thu, 18 Jul 2024 17:45:34 +0900 Subject: [PATCH 18/32] =?UTF-8?q?chore:=20=EB=B0=B0=ED=8F=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=EC=97=90=EC=84=9C=20host=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-CI.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index cc5204a8e..cc49cf60e 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -54,9 +54,6 @@ jobs: - name: Deploy uses: appleboy/ssh-action@v0.1.9 with: - host: ${{ secrets.HOST }} - username: ubuntu - key: ${{ secrets.KEY }} script: | cd /home/ubuntu From 6033dee80daca2a1b2c4c69b5635eb95ebd5fc48 Mon Sep 17 00:00:00 2001 From: jongmee Date: Thu, 18 Jul 2024 18:17:44 +0900 Subject: [PATCH 19/32] =?UTF-8?q?chore:=20=EB=B0=B0=ED=8F=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=EC=97=90=EC=84=9C=20appleboy=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-CI.yml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index cc49cf60e..376a8f924 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -52,20 +52,18 @@ jobs: docker push ${{ secrets.DOCKER_NGINX_IMAGE }} - name: Deploy - uses: appleboy/ssh-action@v0.1.9 - with: - script: | - cd /home/ubuntu - - sudo touch docker-compose.yml - echo "${{ vars.DOCKER_COMPOSE }}" | sudo tee docker-compose.yml > /dev/null - - sudo chmod 666 /var/run/docker.sock - - sudo docker rm -f $(docker ps -qa) - - sudo docker pull ${{ secrets.DOCKER_SERVER_IMAGE }} - sudo docker pull ${{ secrets.DOCKER_NGINX_IMAGE }} - - docker-compose -f docker-compose.yml up -d - docker image prune -f + run: | + cd /home/ubuntu + + sudo touch docker-compose.yml + echo "${{ vars.DOCKER_COMPOSE }}" | sudo tee docker-compose.yml > /dev/null + + sudo chmod 666 /var/run/docker.sock + + sudo docker rm -f $(docker ps -qa) + + sudo docker pull ${{ secrets.DOCKER_SERVER_IMAGE }} + sudo docker pull ${{ secrets.DOCKER_NGINX_IMAGE }} + + docker-compose -f docker-compose.yml up -d + docker image prune -f From 5ee563dc2d80b577f6bbb61eade1494c82799360 Mon Sep 17 00:00:00 2001 From: jongmee Date: Thu, 18 Jul 2024 18:23:37 +0900 Subject: [PATCH 20/32] =?UTF-8?q?chore:=20=EB=B0=B0=ED=8F=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EB=8F=84=EC=BB=A4=20=EC=BB=A4?= =?UTF-8?q?=EB=A7=A8=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CI.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index 376a8f924..8d764daf9 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -60,7 +60,11 @@ jobs: sudo chmod 666 /var/run/docker.sock + if [ "$(docker ps -qa)" ]; then sudo docker rm -f $(docker ps -qa) + else + echo "No containers to remove." + fi sudo docker pull ${{ secrets.DOCKER_SERVER_IMAGE }} sudo docker pull ${{ secrets.DOCKER_NGINX_IMAGE }} From 823c4ccfd31b1444d6498a7346be4d4f4c4e9508 Mon Sep 17 00:00:00 2001 From: jongmee Date: Thu, 18 Jul 2024 19:36:39 +0900 Subject: [PATCH 21/32] =?UTF-8?q?chore:=20=ED=95=98=EC=9C=84=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=84=A4=EC=A0=95=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pokerogue/docker/nginx/conf.d/nginx.conf | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/backend/pokerogue/docker/nginx/conf.d/nginx.conf b/backend/pokerogue/docker/nginx/conf.d/nginx.conf index 52a05fc93..080d590fa 100644 --- a/backend/pokerogue/docker/nginx/conf.d/nginx.conf +++ b/backend/pokerogue/docker/nginx/conf.d/nginx.conf @@ -40,35 +40,3 @@ server { server_name pokerogue-helper.com; return 404; } - -server { - root /var/www/html; - index index.html index.htm index.nginx-debian.html; - server_name back.pokerogue-helper.com; - - location / { - proxy_pass http://localhost:8080; - proxy_set_header X-Real_IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - } - - listen [::]:443 ssl; - listen 443 ssl; - ssl_certificate /etc/letsencrypt/live/back.pokerogue-helper.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/back.pokerogue-helper.com/privkey.pem; - include /etc/letsencrypt/options-ssl-nginx.conf; - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - -} - -server { - if ($host = back.pokerogue-helper.com) { - return 301 https://$host$request_uri; - } - - listen 80 ; - listen [::]:80 ; - server_name back.pokerogue-helper.com; - return 404; -} From 39f03027c3097928fecf63ad2202c6caf1e00b6d Mon Sep 17 00:00:00 2001 From: jongmee Date: Thu, 18 Jul 2024 19:47:01 +0900 Subject: [PATCH 22/32] =?UTF-8?q?chore:=20ipv6=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/docker/nginx/conf.d/nginx.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/pokerogue/docker/nginx/conf.d/nginx.conf b/backend/pokerogue/docker/nginx/conf.d/nginx.conf index 080d590fa..8840caf3b 100644 --- a/backend/pokerogue/docker/nginx/conf.d/nginx.conf +++ b/backend/pokerogue/docker/nginx/conf.d/nginx.conf @@ -4,6 +4,7 @@ server { server_name _; location / { + resolver 8.8.8.8 ipv6=off; proxy_pass http://localhost:8080; proxy_set_header X-Real_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -16,6 +17,7 @@ server { server_name pokerogue-helper.com; location / { + resolver 8.8.8.8 ipv6=off; proxy_pass http://localhost:8080; proxy_set_header X-Real_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From 1f9fb5260888e0c502e1c26a1855c24e770267b2 Mon Sep 17 00:00:00 2001 From: jongmee Date: Thu, 18 Jul 2024 19:52:45 +0900 Subject: [PATCH 23/32] =?UTF-8?q?chore:=20localhost=20ip=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=20=EB=AA=85=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/docker/nginx/conf.d/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/pokerogue/docker/nginx/conf.d/nginx.conf b/backend/pokerogue/docker/nginx/conf.d/nginx.conf index 8840caf3b..2d33fee0d 100644 --- a/backend/pokerogue/docker/nginx/conf.d/nginx.conf +++ b/backend/pokerogue/docker/nginx/conf.d/nginx.conf @@ -5,7 +5,7 @@ server { location / { resolver 8.8.8.8 ipv6=off; - proxy_pass http://localhost:8080; + proxy_pass http://127.0.0.1:8080; proxy_set_header X-Real_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; @@ -18,7 +18,7 @@ server { location / { resolver 8.8.8.8 ipv6=off; - proxy_pass http://localhost:8080; + proxy_pass http://127.0.0.1:8080; proxy_set_header X-Real_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; From 9882b1f6878d082687d729078054dfd0f47ddefd Mon Sep 17 00:00:00 2001 From: jongmee Date: Thu, 18 Jul 2024 19:57:06 +0900 Subject: [PATCH 24/32] =?UTF-8?q?chore:=20proxy=5Fpass=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pokerogue/docker/nginx/conf.d/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/pokerogue/docker/nginx/conf.d/nginx.conf b/backend/pokerogue/docker/nginx/conf.d/nginx.conf index 2d33fee0d..d2a386ef6 100644 --- a/backend/pokerogue/docker/nginx/conf.d/nginx.conf +++ b/backend/pokerogue/docker/nginx/conf.d/nginx.conf @@ -5,7 +5,7 @@ server { location / { resolver 8.8.8.8 ipv6=off; - proxy_pass http://127.0.0.1:8080; + proxy_pass http://server:8080; proxy_set_header X-Real_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; @@ -18,7 +18,7 @@ server { location / { resolver 8.8.8.8 ipv6=off; - proxy_pass http://127.0.0.1:8080; + proxy_pass http://server:8080; proxy_set_header X-Real_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; From 26f004309500017055134bc6de2d83fa3a01e568 Mon Sep 17 00:00:00 2001 From: jongmee Date: Fri, 19 Jul 2024 10:19:14 +0900 Subject: [PATCH 25/32] =?UTF-8?q?chore:=20dev=20db=EC=9A=A9=20ddl-auto=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=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 ea57f9955..ad6414e8a 160000 --- a/backend/pokerogue/src/main/resources +++ b/backend/pokerogue/src/main/resources @@ -1 +1 @@ -Subproject commit ea57f995506076e60c01d4a13c210e50d80d7c00 +Subproject commit ad6414e8a8b280f5e6ae74c3210d591abae40e6b From 51ea3b261d569554e51d4d397b493c4399b1b39f Mon Sep 17 00:00:00 2001 From: jongmee Date: Fri, 19 Jul 2024 10:38:24 +0900 Subject: [PATCH 26/32] =?UTF-8?q?chore:=20ci,=20cd=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CD.yml | 68 ++++++++++++++++++++++++++++++++ .github/workflows/Backend-CI.yml | 46 +-------------------- 2 files changed, 70 insertions(+), 44 deletions(-) create mode 100644 .github/workflows/Backend-CD.yml diff --git a/.github/workflows/Backend-CD.yml b/.github/workflows/Backend-CD.yml new file mode 100644 index 000000000..04912ad68 --- /dev/null +++ b/.github/workflows/Backend-CD.yml @@ -0,0 +1,68 @@ +name: Backend CD + +on: + push: + branches: [ "be/develop" ] + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + steps: + + - name: Checkout + uses: actions/checkout@v3 + with: + token: ${{ secrets.ACTION_TOKEN }} + submodules: true + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + + - name: Build with Gradle + run: ./gradlew bootJar + working-directory: ./backend/pokerogue + + - name: Docker build and push + run: | + docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + + docker build -t ${{ secrets.DOCKER_SERVER_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile ./backend/pokerogue + docker push ${{ secrets.DOCKER_SERVER_IMAGE }} + + docker build -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue/docker + docker push ${{ secrets.DOCKER_NGINX_IMAGE }} + + deploy: + runs-on: self-hosted + steps: + + - name: Change permission + run: | + sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/_work/2024-pokerogue-helper + + - name: Deploy + run: | + cd /home/ubuntu + + sudo touch docker-compose.yml + echo "${{ vars.DOCKER_COMPOSE }}" | sudo tee docker-compose.yml > /dev/null + + sudo chmod 666 /var/run/docker.sock + + if [ "$(docker ps -qa)" ]; then + sudo docker rm -f $(docker ps -qa) + else + echo "No containers to remove." + fi + + sudo docker pull ${{ secrets.DOCKER_SERVER_IMAGE }} + sudo docker pull ${{ secrets.DOCKER_NGINX_IMAGE }} + + docker-compose -f docker-compose.yml up -d + docker image prune -f diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index 8d764daf9..8b7525b43 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -11,16 +11,9 @@ permissions: jobs: build: - env: - working-directory: ./backend/pokerogue - docker-directory: ./backend/pokerogue/docker - runs-on: self-hosted + runs-on: ubuntu-latest steps: - - name: Change permission - run: | - sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/_work/2024-pokerogue-helper - - name: Checkout uses: actions/checkout@v3 with: @@ -35,39 +28,4 @@ jobs: - name: Run Test run: ./gradlew clean test - working-directory: ${{ env.working-directory }} - - - name: Build with Gradle - run: ./gradlew bootJar - working-directory: ${{ env.working-directory }} - - - name: Docker build and push - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - - docker build -t ${{ secrets.DOCKER_SERVER_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile ./backend/pokerogue - docker push ${{ secrets.DOCKER_SERVER_IMAGE }} - - docker build -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue/docker - docker push ${{ secrets.DOCKER_NGINX_IMAGE }} - - - name: Deploy - run: | - cd /home/ubuntu - - sudo touch docker-compose.yml - echo "${{ vars.DOCKER_COMPOSE }}" | sudo tee docker-compose.yml > /dev/null - - sudo chmod 666 /var/run/docker.sock - - if [ "$(docker ps -qa)" ]; then - sudo docker rm -f $(docker ps -qa) - else - echo "No containers to remove." - fi - - sudo docker pull ${{ secrets.DOCKER_SERVER_IMAGE }} - sudo docker pull ${{ secrets.DOCKER_NGINX_IMAGE }} - - docker-compose -f docker-compose.yml up -d - docker image prune -f + working-directory: ./backend/pokerogue From cc3c227507480f1e0f3c81bab4dfb346882552ce Mon Sep 17 00:00:00 2001 From: jongmee Date: Fri, 19 Jul 2024 10:52:59 +0900 Subject: [PATCH 27/32] =?UTF-8?q?chore:=20ci=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=8B=9C=20h2=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Backend-CI.yml b/.github/workflows/Backend-CI.yml index 8b7525b43..e53e0ee09 100644 --- a/.github/workflows/Backend-CI.yml +++ b/.github/workflows/Backend-CI.yml @@ -27,5 +27,5 @@ jobs: distribution: 'temurin' - name: Run Test - run: ./gradlew clean test + run: SPRING_PROFILES_ACTIVE=h2 ./gradlew clean test working-directory: ./backend/pokerogue From e457321c36b1a46f6dae1734ac46b1049961c653 Mon Sep 17 00:00:00 2001 From: jongmee Date: Fri, 19 Jul 2024 10:54:34 +0900 Subject: [PATCH 28/32] =?UTF-8?q?chore:=20cd=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=ED=8A=B8=EB=A6=AC=EA=B1=B0=20=EC=9E=84=EC=8B=9C=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/Backend-CD.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Backend-CD.yml b/.github/workflows/Backend-CD.yml index 04912ad68..1f319bb14 100644 --- a/.github/workflows/Backend-CD.yml +++ b/.github/workflows/Backend-CD.yml @@ -1,6 +1,8 @@ name: Backend CD on: + pull_request: + branches: [ "be/develop" ] push: branches: [ "be/develop" ] From 183803885bb1fe50ab041a41ca73a93c5f90374b Mon Sep 17 00:00:00 2001 From: jongmee Date: Fri, 19 Jul 2024 10:57:09 +0900 Subject: [PATCH 29/32] =?UTF-8?q?chore:=20cd=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20job=20=EC=88=9C=EC=84=9C=20=EA=B3=A0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CD.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Backend-CD.yml b/.github/workflows/Backend-CD.yml index 1f319bb14..40429f9ec 100644 --- a/.github/workflows/Backend-CD.yml +++ b/.github/workflows/Backend-CD.yml @@ -41,6 +41,7 @@ jobs: docker push ${{ secrets.DOCKER_NGINX_IMAGE }} deploy: + needs: build runs-on: self-hosted steps: From 7263a77a024dc04c4b044e4365ee6857b52071b0 Mon Sep 17 00:00:00 2001 From: jongmee Date: Fri, 19 Jul 2024 11:53:24 +0900 Subject: [PATCH 30/32] =?UTF-8?q?chore:=20=EB=A9=80=ED=8B=B0=20=ED=94=8C?= =?UTF-8?q?=EB=9E=AB=ED=8F=BC=20=EC=A7=80=EC=A0=95=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=EB=8F=84=EC=BB=A4=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B9=8C?= =?UTF-8?q?=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CD.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Backend-CD.yml b/.github/workflows/Backend-CD.yml index 40429f9ec..77a5b2da8 100644 --- a/.github/workflows/Backend-CD.yml +++ b/.github/workflows/Backend-CD.yml @@ -34,10 +34,10 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build -t ${{ secrets.DOCKER_SERVER_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile ./backend/pokerogue + docker build --platform=linux/amd64,linux/arm64 -t ${{ secrets.DOCKER_SERVER_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile ./backend/pokerogue docker push ${{ secrets.DOCKER_SERVER_IMAGE }} - docker build -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue/docker + docker build --platform=linux/amd64,linux/arm64 -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue/docker docker push ${{ secrets.DOCKER_NGINX_IMAGE }} deploy: From f9aa387fd1af0911688e0dc77153e356e93fe7c3 Mon Sep 17 00:00:00 2001 From: jongmee Date: Fri, 19 Jul 2024 12:03:48 +0900 Subject: [PATCH 31/32] =?UTF-8?q?chore:=20=ED=94=8C=EB=9E=AB=ED=8F=BC?= =?UTF-8?q?=EC=9D=84=20linux/arm64(=EB=8B=A8=EC=9D=BC)=EB=A1=9C=20?= =?UTF-8?q?=EC=A7=80=EC=A0=95=ED=95=98=EC=97=AC=20=EB=8F=84=EC=BB=A4=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B9=8C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Backend-CD.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Backend-CD.yml b/.github/workflows/Backend-CD.yml index 77a5b2da8..a88376040 100644 --- a/.github/workflows/Backend-CD.yml +++ b/.github/workflows/Backend-CD.yml @@ -34,10 +34,10 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build --platform=linux/amd64,linux/arm64 -t ${{ secrets.DOCKER_SERVER_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile ./backend/pokerogue + docker build --platform=linux/arm64 -t ${{ secrets.DOCKER_SERVER_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile ./backend/pokerogue docker push ${{ secrets.DOCKER_SERVER_IMAGE }} - docker build --platform=linux/amd64,linux/arm64 -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue/docker + docker build --platform=linux/arm64 -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue/docker docker push ${{ secrets.DOCKER_NGINX_IMAGE }} deploy: From e5620f0060818a95bfa5bd09954d7ec8778c24aa Mon Sep 17 00:00:00 2001 From: jongmee Date: Fri, 19 Jul 2024 12:07:45 +0900 Subject: [PATCH 32/32] =?UTF-8?q?chore:=20=EB=B9=8C=EB=93=9C=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=9D=84=20self=20hosted=20runner=EB=A1=9C=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/Backend-CD.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Backend-CD.yml b/.github/workflows/Backend-CD.yml index a88376040..a02f48e28 100644 --- a/.github/workflows/Backend-CD.yml +++ b/.github/workflows/Backend-CD.yml @@ -11,7 +11,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: self-hosted steps: - name: Checkout @@ -34,10 +34,10 @@ jobs: run: | docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build --platform=linux/arm64 -t ${{ secrets.DOCKER_SERVER_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile ./backend/pokerogue + docker build -t ${{ secrets.DOCKER_SERVER_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile ./backend/pokerogue docker push ${{ secrets.DOCKER_SERVER_IMAGE }} - docker build --platform=linux/arm64 -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue/docker + docker build -t ${{ secrets.DOCKER_NGINX_IMAGE }} -f ./backend/pokerogue/docker/Dockerfile-nginx ./backend/pokerogue/docker docker push ${{ secrets.DOCKER_NGINX_IMAGE }} deploy: