From a9843c93f4552686241a355b38a435d25ef88df4 Mon Sep 17 00:00:00 2001 From: echo724 Date: Wed, 22 Nov 2023 16:46:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20action=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=EB=A5=BC=20=EC=9D=B4=EC=A0=84=ED=95=9C=20?= =?UTF-8?q?=EC=9D=B8=ED=94=84=EB=9D=BC=EC=97=90=20=EB=A7=9E=EA=B2=8C=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/build-be-dev.yml | 2 +- .github/workflows/build-be-prod.yml | 2 +- .github/workflows/build-fe-dev.yml | 2 +- .github/workflows/build-fe-prod.yml | 2 +- .github/workflows/deploy-dev.yml | 2 +- .github/workflows/deploy-prod.yml | 2 +- backend/Dockerfile-dev | 1 - compose-blue.yml | 6 ------ compose-green.yml | 6 ------ 9 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-be-dev.yml b/.github/workflows/build-be-dev.yml index 8e57d40d3..c93927234 100644 --- a/.github/workflows/build-be-dev.yml +++ b/.github/workflows/build-be-dev.yml @@ -65,7 +65,7 @@ jobs: file: ./backend/Dockerfile-dev push: true tags: ${{ secrets.DOCKER_USERNAME }}/dong-gle-backend-dev:latest - platforms: linux/arm64 + platforms: linux/amd64 deploy: needs: build diff --git a/.github/workflows/build-be-prod.yml b/.github/workflows/build-be-prod.yml index a30bcaba7..3810d464b 100644 --- a/.github/workflows/build-be-prod.yml +++ b/.github/workflows/build-be-prod.yml @@ -61,4 +61,4 @@ jobs: file: ./backend/Dockerfile-prod push: true tags: ${{ secrets.DOCKER_USERNAME }}/dong-gle-backend-prod:latest - platforms: linux/arm64 + platforms: linux/amd64 diff --git a/.github/workflows/build-fe-dev.yml b/.github/workflows/build-fe-dev.yml index 10a817a44..ccceac749 100644 --- a/.github/workflows/build-fe-dev.yml +++ b/.github/workflows/build-fe-dev.yml @@ -56,7 +56,7 @@ jobs: file: ${{ vars.FE_DIRECTORY }}/Dockerfile push: true tags: ${{ secrets.DOCKER_USERNAME }}/dong-gle-frontend-dev:latest - platforms: linux/arm64 + platforms: linux/amd64 deploy: needs: build diff --git a/.github/workflows/build-fe-prod.yml b/.github/workflows/build-fe-prod.yml index a9c728181..dea2a1210 100644 --- a/.github/workflows/build-fe-prod.yml +++ b/.github/workflows/build-fe-prod.yml @@ -52,4 +52,4 @@ jobs: file: ${{ vars.FE_DIRECTORY }}/Dockerfile push: true tags: ${{ secrets.DOCKER_USERNAME }}/dong-gle-frontend-prod:latest - platforms: linux/arm64 + platforms: linux/amd64 diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 0b1aecdb1..3cc75b8a1 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -9,7 +9,7 @@ permissions: jobs: deploy: - runs-on: [self-hosted, dev] + runs-on: [self-hosted, donggle-dev] steps: - uses: actions/checkout@v3 - name: create .env diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index d4145422a..a08fce594 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -16,7 +16,7 @@ jobs: secrets: inherit deploy: - runs-on: [self-hosted, prod] + runs-on: [self-hosted, donggle-prod] needs: [fe-build, be-build] steps: - uses: actions/checkout@v3 diff --git a/backend/Dockerfile-dev b/backend/Dockerfile-dev index 8a2e421f4..6557e72e0 100644 --- a/backend/Dockerfile-dev +++ b/backend/Dockerfile-dev @@ -4,7 +4,6 @@ EXPOSE 8080 COPY ./build/libs/backend-0.0.1-SNAPSHOT.jar /app.jar ENTRYPOINT [ \ "java",\ - "-javaagent:/javaagent/dd-java-agent.jar",\ "-jar",\ "-Duser.timezone=Asia/Seoul",\ "app.jar"\ diff --git a/compose-blue.yml b/compose-blue.yml index 3bc5a8254..f79ccd5bd 100644 --- a/compose-blue.yml +++ b/compose-blue.yml @@ -7,7 +7,6 @@ services: image: ${DOCKER_USERNAME}/dong-gle-backend-${INFRA_PROFILE} volumes: - /home/ubuntu/logs/:/logs/ - - /home/ubuntu/javaagent/:/javaagent/ environment: - HIKARI_MAX_POOL_SIZE - HIKARI_MIN_IDLE @@ -15,11 +14,6 @@ services: - TOMCAT_ACCEPT_COUNT - TOMCAT_MAX_CONNECTIONS - SPRING_PROFILES_ACTIVE - - DD_ENV=dev - - DD_SERVICE=Backend - - DD_AGENT_HOST=datadog-agent - - DD_TRACE_AGENT_PORT=8126 - - DD_LOGS_INJECTION=true networks: default: name: donggle-network diff --git a/compose-green.yml b/compose-green.yml index 50c946d78..75c3ff4bf 100644 --- a/compose-green.yml +++ b/compose-green.yml @@ -7,7 +7,6 @@ services: image: ${DOCKER_USERNAME}/dong-gle-backend-${INFRA_PROFILE} volumes: - /home/ubuntu/logs/:/logs/ - - /home/ubuntu/javaagent/:/javaagent/ environment: - HIKARI_MAX_POOL_SIZE - HIKARI_MIN_IDLE @@ -15,11 +14,6 @@ services: - TOMCAT_ACCEPT_COUNT - TOMCAT_MAX_CONNECTIONS - SPRING_PROFILES_ACTIVE - - DD_ENV=dev - - DD_SERVICE=Backend - - DD_AGENT_HOST=datadog-agent - - DD_TRACE_AGENT_PORT=8126 - - DD_LOGS_INJECTION=true networks: default: name: donggle-network From dcef36b5035245b9a59bb55be693b19582dc6495 Mon Sep 17 00:00:00 2001 From: echo724 Date: Wed, 22 Nov 2023 16:51:00 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20Submodule=20=EC=BB=A4=EB=B0=8B=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/config b/backend/src/main/resources/config index 1872cc111..70c74bb50 160000 --- a/backend/src/main/resources/config +++ b/backend/src/main/resources/config @@ -1 +1 @@ -Subproject commit 1872cc1118c444d27c65450a2085d839a2347a1a +Subproject commit 70c74bb50ce2c854585df15de13a5c7aa5777faa