From 76361e272d64a33314ebc97b982c84adced5927f Mon Sep 17 00:00:00 2001
From: pgsshiho <s24071@gsm.hs.kr>
Date: Mon, 7 Apr 2025 13:47:15 +0900
Subject: [PATCH 1/6] final branch maybe

---
 .github/PULL_REQUEST_TEMPLATE.md   |  9 ++++++++-
 .github/workflows/build.yaml       |  8 +++++---
 Dockerfile                         | 11 +++++++++--
 src/main/resources/application.yml |  4 +++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f3617e3..bf08b01 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +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 요청 결과 스크린샷
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 68d6739..2695a3c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -24,14 +24,16 @@ 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 8080:8080 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
-        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:8080/health/check")
+          RESPONSE=$(curl -s "http://localhost:1234/health/check")
           if [ "$RESPONSE" != "OK" ]; then
             echo "💣 Health Check Failed"
             exit 1
diff --git a/Dockerfile b/Dockerfile
index 7df80f6..9c409db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,9 @@
-# 아래 ENV 명령어를 제외하고 주석을 제거한 후 Dockerfile를 작성하세요.
-ENV SPRING_PROFILES_ACTIVE=test
\ No newline at end of file
+ROM 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 76aa623521c0a00428eeac987ef551bd20637d12 Mon Sep 17 00:00:00 2001
From: pgsshiho <s24071@gsm.hs.kr>
Date: Mon, 7 Apr 2025 13:52:15 +0900
Subject: [PATCH 2/6] again

---
 .github/workflows/build.yaml | 2 +-
 Dockerfile                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2695a3c..60a3784 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -33,7 +33,7 @@ jobs:
           timeout 60s docker logs -f task27-server
       - 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
diff --git a/Dockerfile b/Dockerfile
index 9c409db..d9e7dbe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ROM gradle:8-jdk-alpine AS builder
+FROM gradle:8-jdk-alpine AS builder
 WORKDIR /app
 COPY --chown=gradle:gradle . .
 RUN gradle build --no-daemon

From b031c5c6e8f95efed8bec5d381db518a0dcd9007 Mon Sep 17 00:00:00 2001
From: pgsshiho <s24071@gsm.hs.kr>
Date: Mon, 7 Apr 2025 13:56:37 +0900
Subject: [PATCH 3/6] again2

---
 .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 60a3784..2695a3c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -33,7 +33,7 @@ jobs:
           timeout 60s docker logs -f 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 682222a0e00ddfb6798a70f2f144efae85b1478e Mon Sep 17 00:00:00 2001
From: pgsshiho <s24071@gsm.hs.kr>
Date: Mon, 7 Apr 2025 14:05:12 +0900
Subject: [PATCH 4/6] again2

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d9e7dbe..7262c18 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,6 @@ 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
+COPY --from=builder /app/build/libs/task27-0.0.1-SNAPSHOT.jar app.jar
 ENV APP_JAR=app.jar
 CMD ["java", "-jar", "$APP_JAR"]
\ No newline at end of file

From 5ca6cf0d52b8bcb6a8d6ba7531d464af19fc12a1 Mon Sep 17 00:00:00 2001
From: pgsshiho <s24071@gsm.hs.kr>
Date: Mon, 7 Apr 2025 14:09:06 +0900
Subject: [PATCH 5/6] again4

---
 Dockerfile                         | 21 ++++++++++++---------
 src/main/resources/application.yml |  4 +---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7262c18..7d6f83b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,12 @@
-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/task27-0.0.1-SNAPSHOT.jar app.jar
-ENV APP_JAR=app.jar
-CMD ["java", "-jar", "$APP_JAR"]
\ No newline at end of file
+FROM gradle:8.3-jdk17 AS builder
+WORKDIR /build
+
+COPY . /build
+RUN gradle build -x test --parallel
+
+FROM openjdk:23-jdk-slim AS runtime
+ENV SPRING_PROFILES_ACTIVE=test
+WORKDIR /build
+COPY --from=builder /build/build/libs/*.jar app.jar
+EXPOSE 8080
+ENTRYPOINT ["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 f658430..6442bba 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,6 +2,4 @@ spring:
   application:
     name: task27
     profiles:
-      active: ${SPRING_PROFILES_ACTIVE:dev}
-server:
-  port: 1234
\ No newline at end of file
+      active: ${SPRING_PROFILES_ACTIVE:dev}
\ No newline at end of file

From 5c161cb0fe6b15a342c956a99962e8e6676231c8 Mon Sep 17 00:00:00 2001
From: pgsshiho <s24071@gsm.hs.kr>
Date: Mon, 7 Apr 2025 14:13:53 +0900
Subject: [PATCH 6/6] again5

---
 .github/workflows/build.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2695a3c..68d6739 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -24,16 +24,14 @@ 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 8080:8080 -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 task27:test
       - name: ⌛ Wait for Application
         run: sleep 45
       - name: 📃 Log Trace
-        run: |
-          echo "📢 Tracking logs for task27-server..."
-          timeout 60s docker logs -f task27-server
+        run: docker logs task27-server
       - 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