✨ fix : Dockerfile 원래대로 수정 후, Github Actions Docker 이미지 캐싱 적용

Author: steamedEggMaster

.github/workflows/ci-cd-main.yml

@@ -11,24 +11,21 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3  # 최신 버전 사용
+        uses: actions/checkout@v3
 
-      # 캐싱 추가
-      - name: Cache Gradle
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Cache Docker layers
         uses: actions/cache@v3
         with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-gradle-        
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2  # 최신 버전 사용
+            ${{ runner.os }}-buildx-
 
       - name: Log in to Google Cloud
-        uses: google-github-actions/auth@v1  # 최신 버전 사용
+        uses: google-github-actions/auth@v1
         with:
           credentials_json: ${{ secrets.GCP_CREDENTIALS }}
 
@@ -37,7 +34,10 @@ jobs:
 
       - name: Build and push Docker image
         run: |
-          docker buildx build --push \
+          docker buildx build \
+            --cache-from=type=local,src=/tmp/.buildx-cache \
+            --cache-to=type=local,dest=/tmp/.buildx-cache,mode=min \
+            --push \
             --tag asia-northeast3-docker.pkg.dev/symbolic-yen-441710-h6/practice-main/kafka-user:${{ github.sha }} .
 
   deploy:
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout deployment repo
-        uses: actions/checkout@v3  # 최신 버전 사용
+        uses: actions/checkout@v3
         with:
           repository: kafka-practice/kafka-manifest
           path: manifests

Dockerfile

@@ -1,47 +1,25 @@
 # builder image
 FROM amazoncorretto:17-al2-jdk AS builder
 
-# 작업 디렉토리 생성
 RUN mkdir /kafka-user
 WORKDIR /kafka-user
 
-# Gradle Wrapper 및 설정 파일 복사
-COPY gradlew .
-COPY gradle ./gradle
-COPY build.gradle settings.gradle ./
+COPY . .
 
-# Gradle 의존성 캐시 적용
-RUN ./gradlew dependencies || return 0
-
-## 소스 코드 복사
-#COPY . .
-
-# 소스 코드 복사 (자주 변경되는 파일)
-COPY src ./src
-
-# Gradle 실행 권한 추가
 RUN chmod +x gradlew
-
-# Layered JAR 생성 및 레이어 추출
-RUN ./gradlew bootJar && \
-    java -Djarmode=layertools -jar build/libs/kafka-user-*.jar extract
+RUN ./gradlew clean bootJar
 
 # runtime image
 FROM amazoncorretto:17.0.12-al2
 
-# 환경 변수 설정
 ENV TZ=Asia/Seoul
 ENV PROFILE=${PROFILE}
 
-# 작업 디렉토리 생성
 RUN mkdir /kafka-user
 WORKDIR /kafka-user
 
-# 레이어별로 파일 복사
-COPY --from=builder /kafka-user/dependencies/ ./dependencies/
-COPY --from=builder /kafka-user/spring-boot-loader/ ./spring-boot-loader/
-COPY --from=builder /kafka-user/snapshot-dependencies/ ./snapshot-dependencies/
-COPY --from=builder /kafka-user/application/ ./application/
+COPY --from=builder /kafka-user/build/libs/kafka-user-* /kafka-user/app.jar
 
-# 애플리케이션 실행
-CMD ["java", "-Dspring.profiles.active=${PROFILE}", "-Duser.timezone=Asia/Seoul", "org.springframework.boot.loader.JarLauncher"]
+CMD ["sh", "-c", " \
+    java -Dspring.profiles.active=${PROFILE} \
+         -jar /kafka-user/app.jar"]