From efbdf26205d5b139fa8bc29059e0d94b3f35b590 Mon Sep 17 00:00:00 2001 From: pgsshiho Date: Thu, 3 Apr 2025 17:28:33 +0900 Subject: [PATCH 01/10] 2-7 feedback --- .github/PULL_REQUEST_TEMPLATE.md | 10 ++++++++-- Dockerfile | 11 +++++++++-- src/main/resources/application.yml | 4 +++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f3617e3..45c13fe 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,7 +1,13 @@ ## πŸ‹ Dockerfile λ‚΄μš© ```dockerfile -# ν•΄λ‹Ή 주석을 μ§€μš°κ³  Dockerfile λ‚΄μš©μ„ μž…λ ₯ν•΄μ£Όμ„Έμš”. +FROM gradle:8-jdk-alpine AS builder +WORKDIR /app +COPY --chown=gradle:gradle . . +RUN gradle build --no-daemon +FROM openjdk:17-jdk-slim +WORKDIR /app +COPY --from=builder /app/build/libs/*.jar app.jar +CMD ["java", "-jar", "app.jar"] ``` ## πŸ“· API μš”μ²­ κ²°κ³Ό μŠ€ν¬λ¦°μƒ· -> API μš”μ²­ 결과의 μŠ€ν¬λ¦°μƒ·λ“€μ„ μ²¨λΆ€ν•˜μ—¬μ£Όμ„Έμš”. \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 7df80f6..d9e7dbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,9 @@ -# μ•„λž˜ ENV λͺ…λ Ήμ–΄λ₯Ό μ œμ™Έν•˜κ³  주석을 μ œκ±°ν•œ ν›„ Dockerfileλ₯Ό μž‘μ„±ν•˜μ„Έμš”. -ENV SPRING_PROFILES_ACTIVE=test \ No newline at end of file +FROM gradle:8-jdk-alpine AS builder +WORKDIR /app +COPY --chown=gradle:gradle . . +RUN gradle build --no-daemon +FROM openjdk:17-jdk-slim AS runtime +WORKDIR /app +COPY --from=builder /app/build/libs/*.jar app.jar +ENV APP_JAR=app.jar +CMD ["java", "-jar", "$APP_JAR"] \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6442bba..f658430 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,4 +2,6 @@ spring: application: name: task27 profiles: - active: ${SPRING_PROFILES_ACTIVE:dev} \ No newline at end of file + active: ${SPRING_PROFILES_ACTIVE:dev} +server: + port: 1234 \ No newline at end of file From c69e0b2b3a8408148df0b63b66868b0040eceea1 Mon Sep 17 00:00:00 2001 From: pgsshiho Date: Thu, 3 Apr 2025 17:42:02 +0900 Subject: [PATCH 02/10] 2-7 feedback --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 68d6739..e781652 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -31,7 +31,7 @@ jobs: run: docker logs task27-server - name: πŸ§ͺ Test Application run: | - RESPONSE=$(curl -s "http://localhost:8080/health/check") + RESPONSE=$(curl -s "http://localhost:1234/health/check") if [ "$RESPONSE" != "OK" ]; then echo "πŸ’£ Health Check Failed" exit 1 From 01f1d64723d220dd996eed423f344d4ff7ed93f5 Mon Sep 17 00:00:00 2001 From: pgsshiho Date: Thu, 3 Apr 2025 18:01:00 +0900 Subject: [PATCH 03/10] 2-7 feedback --- .github/workflows/build.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e781652..7039436 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,10 @@ jobs: - name: βŒ› Wait for Application run: sleep 45 - name: πŸ“ƒ Log Trace - run: docker logs task27-server + run: | + echo "πŸ“’ Tracking logs for task27-server..." + timeout 60s docker logs -f task27-server + - name: πŸ§ͺ Test Application run: | RESPONSE=$(curl -s "http://localhost:1234/health/check") From 50f198ecd1461f730eae2d1ba9d68a60e545e250 Mon Sep 17 00:00:00 2001 From: pgsshiho Date: Thu, 3 Apr 2025 18:06:37 +0900 Subject: [PATCH 04/10] 2-7 feedback --- .github/workflows/build.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7039436..ef689ae 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,8 +23,13 @@ jobs: run: docker-compose -f compose.yaml up -d - name: βŒ› Wait for Services run: sleep 30 - - name: πŸ‹ Run Task.2-7 Server Container - run: docker run --name task27-server --network=compose_default -d -p 8080:8080 task27:test + - - name: πŸ‹ Run Task.2-7 Server Container + - run: | + docker run --name task27-server \ + --network=compose_default \ + -e APP_JAR=/app/myapp.jar \ # μ—¬κΈ°μ„œ APP_JAR μ„€μ • + -d -p 1234:1234 task27:test + - name: βŒ› Wait for Application run: sleep 45 - name: πŸ“ƒ Log Trace From 1fd8ac35a65c3e9e644c27656cce08cdc60cb1b1 Mon Sep 17 00:00:00 2001 From: pgsshiho Date: Thu, 3 Apr 2025 18:08:19 +0900 Subject: [PATCH 05/10] 2-7 feedback --- .github/workflows/build.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ef689ae..d2393d4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,13 +23,8 @@ jobs: run: docker-compose -f compose.yaml up -d - name: βŒ› Wait for Services run: sleep 30 - - - name: πŸ‹ Run Task.2-7 Server Container - - run: | - docker run --name task27-server \ - --network=compose_default \ - -e APP_JAR=/app/myapp.jar \ # μ—¬κΈ°μ„œ APP_JAR μ„€μ • - -d -p 1234:1234 task27:test - + - name: πŸ‹ Run Task.2-7 Server Container + run: docker run --name task27-server --network=compose_default -d -p 1234:1234 task27:test - name: βŒ› Wait for Application run: sleep 45 - name: πŸ“ƒ Log Trace From 7a179a5ceb985b46fcce01ce6730aa855711e0ea Mon Sep 17 00:00:00 2001 From: pgsshiho Date: Thu, 3 Apr 2025 18:14:26 +0900 Subject: [PATCH 06/10] thofhasiofhvidsvnxclvFILDSKf --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d2393d4..53805d3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -24,7 +24,7 @@ jobs: - name: βŒ› Wait for Services run: sleep 30 - name: πŸ‹ Run Task.2-7 Server Container - run: docker run --name task27-server --network=compose_default -d -p 1234:1234 task27:test + run: docker run --name task27-server --network=compose_default -d -p 1234:1234 -e APP_JAR=/app/myapp.jar task27:test - name: βŒ› Wait for Application run: sleep 45 - name: πŸ“ƒ Log Trace From f15852a28b0f000a27b3764f2ff0e9c2ad3464f3 Mon Sep 17 00:00:00 2001 From: pgsshiho Date: Thu, 3 Apr 2025 18:25:59 +0900 Subject: [PATCH 07/10] thofhasiofhvidsvnxclvFILDSKf --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 53805d3..bca903c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -24,7 +24,7 @@ jobs: - name: βŒ› Wait for Services run: sleep 30 - name: πŸ‹ Run Task.2-7 Server Container - run: docker run --name task27-server --network=compose_default -d -p 1234:1234 -e APP_JAR=/app/myapp.jar task27:test + run: docker run --name task27-server --network=compose_default -d -p 1234:1234 -e APP_JAR=/app/task27-0.0.1-SNAPSHOT.jar task27:test - name: βŒ› Wait for Application run: sleep 45 - name: πŸ“ƒ Log Trace From cee3301447b771c220a0141f7e867f91e24eaf3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?CHOIMINJUN=28=EC=B5=9C=EB=AF=BC=EC=A4=80=29?= Date: Thu, 3 Apr 2025 20:12:23 +0900 Subject: [PATCH 08/10] Update application.yml --- src/main/resources/application.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f658430..b2f6de2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,5 +3,3 @@ spring: name: task27 profiles: active: ${SPRING_PROFILES_ACTIVE:dev} -server: - port: 1234 \ No newline at end of file From 017705d4e17507a511e0ccea3c1a643487d819a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?CHOIMINJUN=28=EC=B5=9C=EB=AF=BC=EC=A4=80=29?= Date: Thu, 3 Apr 2025 20:12:47 +0900 Subject: [PATCH 09/10] Update build.yaml --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bca903c..db44861 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -34,8 +34,8 @@ jobs: - name: πŸ§ͺ Test Application run: | - RESPONSE=$(curl -s "http://localhost:1234/health/check") + RESPONSE=$(curl -s "http://localhost:8080/health/check") if [ "$RESPONSE" != "OK" ]; then echo "πŸ’£ Health Check Failed" exit 1 - fi \ No newline at end of file + fi From 28c525cf360f3fe4ff6cb01f115c91bc2be8fc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?CHOIMINJUN=28=EC=B5=9C=EB=AF=BC=EC=A4=80=29?= Date: Thu, 3 Apr 2025 20:13:10 +0900 Subject: [PATCH 10/10] Update build.yaml --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index db44861..3f07adc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -24,7 +24,7 @@ jobs: - name: βŒ› Wait for Services run: sleep 30 - name: πŸ‹ Run Task.2-7 Server Container - run: docker run --name task27-server --network=compose_default -d -p 1234:1234 -e APP_JAR=/app/task27-0.0.1-SNAPSHOT.jar task27:test + run: docker run --name task27-server --network=compose_default -d -p 8080:8080 -e APP_JAR=/app/task27-0.0.1-SNAPSHOT.jar task27:test - name: βŒ› Wait for Application run: sleep 45 - name: πŸ“ƒ Log Trace