[RELEASE] v24.08.22.01 (#356)

YAPP-Github · Aug 21, 2024 · ed640b5 · ed640b5
2 parents cfd2d45 + a0aac58
commit ed640b5
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 2 deletions.
diff --git a/.github/workflows/ecs-cd.yml b/.github/workflows/ecs-cd.yml
@@ -73,7 +73,7 @@ jobs:
                   ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
               run: |
                   GIT_HASH=$(git rev-parse --short HEAD)
-                  ./gradlew buildEcsDockerImage -PimageName=${ECR_REGISTRY}/${ECR_REPOSITORY}:latest
+                  ./gradlew buildPinpointEcsDockerImagePrd -PimageName=${ECR_REGISTRY}/${ECR_REPOSITORY}:latest
                   docker tag ${ECR_REGISTRY}/${ECR_REPOSITORY}:latest ${ECR_REGISTRY}/${ECR_REPOSITORY}:${GIT_HASH}
                   docker push ${ECR_REGISTRY}/${ECR_REPOSITORY} --all-tags
             - name: Get ECR Repository image path

diff --git a/.github/workflows/ecs-dev-cd.yml b/.github/workflows/ecs-dev-cd.yml
@@ -73,7 +73,7 @@ jobs:
                   ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
               run: |
                   GIT_HASH=$(git rev-parse --short HEAD)
-                  ./gradlew buildEcsDockerImage -PimageName=${ECR_REGISTRY}/${ECR_REPOSITORY}:latest
+                  ./gradlew buildPinpointEcsDockerImageDev -PimageName=${ECR_REGISTRY}/${ECR_REPOSITORY}:latest
                   docker tag ${ECR_REGISTRY}/${ECR_REPOSITORY}:latest ${ECR_REGISTRY}/${ECR_REPOSITORY}:${GIT_HASH}
                   docker push ${ECR_REGISTRY}/${ECR_REPOSITORY} --all-tags
             - name: Get ECR Repository image path

diff --git a/api/Dockerfile.dev.pinpoint b/api/Dockerfile.dev.pinpoint
@@ -0,0 +1,21 @@
+FROM  openjdk:18-oracle
+
+RUN mkdir -p /logs
+
+ENV	PROFILE default
+ENV TZ=Asia/Seoul
+
+
+EXPOSE 8080
+
+ARG JAVA_OPTS
+
+ARG RELEASE_VERSION
+ENV DD_VERSION=${RELEASE_VERSION}
+
+ARG JAR_FILE="build/libs/api.jar"
+COPY ${JAR_FILE} app.jar
+
+VOLUME /pinpoint-agent
+
+ENTRYPOINT java -XX:MaxGCPauseMillis=100 -XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=80.0 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 $JAVA_OPTS -jar -javaagent:/pinpoint-agent/pinpoint-bootstrap.jar -Dpinpoint.profiler.profiles.active=release -Dpinpoint.applicationName=fewletter-api-dev app.jar
diff --git a/api/Dockerfile.prd.pinpoint b/api/Dockerfile.prd.pinpoint
@@ -0,0 +1,21 @@
+FROM  openjdk:18-oracle
+
+RUN mkdir -p /logs
+
+ENV	PROFILE default
+ENV TZ=Asia/Seoul
+
+
+EXPOSE 8080
+
+ARG JAVA_OPTS
+
+ARG RELEASE_VERSION
+ENV DD_VERSION=${RELEASE_VERSION}
+
+ARG JAR_FILE="build/libs/api.jar"
+COPY ${JAR_FILE} app.jar
+
+VOLUME /pinpoint-agent
+
+ENTRYPOINT java -XX:MaxGCPauseMillis=100 -XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=80.0 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 $JAVA_OPTS -jar -javaagent:/pinpoint-agent/pinpoint-bootstrap.jar -Dpinpoint.profiler.profiles.active=release -Dpinpoint.applicationName=fewletter-api-prd app.jar
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -211,4 +211,46 @@ tasks.register("buildEcsDockerImage") {
             )
         }
     }
+}
+
+tasks.register("buildPinpointEcsDockerImageDev") {
+    dependsOn("bootJar")
+
+    doLast {
+        exec {
+            workingDir(".")
+            commandLine(
+                "docker",
+                "build",
+                "-t",
+                imageName,
+                "--build-arg",
+                "RELEASE_VERSION=$releaseVersion",
+                "-f",
+                "Dockerfile.dev.pinpoint",
+                '.'
+            )
+        }
+    }
+}
+
+tasks.register("buildPinpointEcsDockerImagePrd") {
+    dependsOn("bootJar")
+
+    doLast {
+        exec {
+            workingDir(".")
+            commandLine(
+                "docker",
+                "build",
+                "-t",
+                imageName,
+                "--build-arg",
+                "RELEASE_VERSION=$releaseVersion",
+                "-f",
+                "Dockerfile.prd.pinpoint",
+                '.'
+            )
+        }
+    }
 }