From 091c23e8f15fa8b17669d6a5a29dbeb48eb522a5 Mon Sep 17 00:00:00 2001 From: jihwan2da Date: Tue, 28 May 2024 00:32:49 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20Dockerfile=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile_STG | 7 +++---- aws/task-definition-stg.json => task-definition-stg.json | 0 2 files changed, 3 insertions(+), 4 deletions(-) rename aws/task-definition-stg.json => task-definition-stg.json (100%) diff --git a/Dockerfile_STG b/Dockerfile_STG index 5c16513..d6e549e 100644 --- a/Dockerfile_STG +++ b/Dockerfile_STG @@ -3,9 +3,8 @@ FROM openjdk:17.0-slim ARG PROJECT_DIRECTORY=/build WORKDIR $PROJECT_DIRECTORY -ARG JAR_FILE_PATH=api/build/libs/GloddyChat-0.0.1-SNAPSHOT.jar -COPY ${JAR_FILE_PATH} GloddyChat.jar - +ARG JAR_FILE_PATH=api/build/libs/GloddyChat.jar +COPY ${JAR_FILE_PATH} app.jar ENV TZ=Asia/Seoul @@ -15,4 +14,4 @@ RUN apt-get update && apt-get install -y curl wget \ && wget -O dd-java-agent.jar 'https://dtdg.co/latest-java-tracer' \ && rm -rf /var/lib/apt/lists/* -ENTRYPOINT ["java", "-javaagent:dd-java-agent.jar", "-Ddd.profiling.enabled=true", "-XX:FlightRecorderOptions=stackdepth=256", "-Ddd.appsec.enabled=true", "-Ddd.iast.enabled=true", "-Ddd.logs.injection=true", "-Ddd.jmxfetch.enabled=true", "-Ddd.service=gloddy-community", "-Ddd.env=production", "-jar", "app.jar"] +ENTRYPOINT ["java", "-javaagent:dd-java-agent.jar", "-Ddd.profiling.enabled=true", "-XX:FlightRecorderOptions=stackdepth=256", "-Ddd.appsec.enabled=true", "-Ddd.iast.enabled=true", "-Ddd.logs.injection=true", "-Ddd.jmxfetch.enabled=true", "-Ddd.service=gloddy-chat", "-Ddd.env=staging", "-jar", "app.jar"] diff --git a/aws/task-definition-stg.json b/task-definition-stg.json similarity index 100% rename from aws/task-definition-stg.json rename to task-definition-stg.json From dfc0387d8ceb8f00625593bc04a03b2f3b77564a Mon Sep 17 00:00:00 2001 From: jihwan2da Date: Tue, 28 May 2024 00:33:12 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20stg=20cd=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/stg-deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/stg-deploy.yml b/.github/workflows/stg-deploy.yml index 967d20b..7064b17 100644 --- a/.github/workflows/stg-deploy.yml +++ b/.github/workflows/stg-deploy.yml @@ -2,15 +2,15 @@ name: Deploy on stg Server (Amazon ECS) on: pull_request: - types: [ closed ] - branches: [ develop ] + types: [closed] + branches: [develop] env: AWS_REGION: ap-northeast-2 ECR_REPOSITORY: chat-stg ECS_SERVICE: chat-service ECS_CLUSTER: gloddy-ecs-stg - ECS_TASK_DEFINITION: ./aws/task-definition-stg.json + ECS_TASK_DEFINITION: task-definition-stg.json CONTAINER_NAME: springboot