chore: GitHub Action 스크립트를 이전한 인프라에 맞게 수정 (#612)

* chore: action 스크립트를 이전한 인프라에 맞게 수정 * chore: Submodule 커밋 업데이트
woowacourse-teams · Nov 22, 2023 · 0674957 · 0674957
1 parent ed81898
commit 0674957
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/backend/src/main/resources/config b/backend/src/main/resources/config
diff --git a/compose-blue.yml b/compose-blue.yml
@@ -7,19 +7,13 @@ 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
       - TOMCAT_MAX_THREADS
       - 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
@@ -7,19 +7,13 @@ 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
       - TOMCAT_MAX_THREADS
       - 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