From 4ce62ad668bddc9261dac95b099b978fbe5633ec Mon Sep 17 00:00:00 2001 From: youcastle03 Date: Sun, 14 Sep 2025 17:34:42 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:dockerfile=EC=97=90=20arm=EB=AA=85?= =?UTF-8?q?=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci-cd.yml | 1 + docker/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 2d8e304..1858f9c 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -104,6 +104,7 @@ jobs: push: true tags: ${{ secrets.ECR_REGISTRY }}/${{ secrets.ECR_REPOSITORY }}:${{ github.sha }} + - name: Set image build result if: always() id: image-build-result diff --git a/docker/Dockerfile b/docker/Dockerfile index d75baf2..8c77566 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,11 @@ -FROM openjdk:21-jdk as builder +FROM --platform=linux/arm64 openjdk:21-jdk as builder WORKDIR /workspace/app # JAR 파일을 레이어별로 추출 COPY build/libs/*SNAPSHOT.jar app.jar RUN java -Djarmode=layertools -jar app.jar extract -FROM openjdk:21-jdk +FROM --platform=linux/arm64 openjdk:21-jdk WORKDIR /dnd_13th_5team_dev COPY --from=builder /workspace/app/spring-boot-loader/ ./ From f52db77bff5b30fb4a395f1dcc77a8a345d535ab Mon Sep 17 00:00:00 2001 From: youcastle03 Date: Sun, 14 Sep 2025 18:06:17 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:gemini=20=EB=A6=AC=EB=B7=B0=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci-cd.yml | 1 - docker/Dockerfile | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 1858f9c..2d8e304 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -104,7 +104,6 @@ jobs: push: true tags: ${{ secrets.ECR_REGISTRY }}/${{ secrets.ECR_REPOSITORY }}:${{ github.sha }} - - name: Set image build result if: always() id: image-build-result diff --git a/docker/Dockerfile b/docker/Dockerfile index 8c77566..e9d2bc1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,12 @@ -FROM --platform=linux/arm64 openjdk:21-jdk as builder +ARG TARGETPLATFORM +FROM --platform=${TARGETPLATFORM:-linux/amd64} openjdk:21-jdk as builder WORKDIR /workspace/app # JAR 파일을 레이어별로 추출 COPY build/libs/*SNAPSHOT.jar app.jar RUN java -Djarmode=layertools -jar app.jar extract -FROM --platform=linux/arm64 openjdk:21-jdk +FROM --platform=${TARGETPLATFORM:-linux/amd64} openjdk:21-jdk WORKDIR /dnd_13th_5team_dev COPY --from=builder /workspace/app/spring-boot-loader/ ./ From 5358a7e422518b2151a987afbefc6bf842dc3857 Mon Sep 17 00:00:00 2001 From: youcastle03 Date: Sun, 14 Sep 2025 18:08:00 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:workflow=20=EB=B0=9C=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/subscription/repository/SubscriptionRepository.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/dnd/sub/domain/subscription/repository/SubscriptionRepository.java b/src/main/java/com/dnd/sub/domain/subscription/repository/SubscriptionRepository.java index 2625015..ca4eccf 100644 --- a/src/main/java/com/dnd/sub/domain/subscription/repository/SubscriptionRepository.java +++ b/src/main/java/com/dnd/sub/domain/subscription/repository/SubscriptionRepository.java @@ -16,4 +16,5 @@ public interface SubscriptionRepository extends JpaRepository findByIdAndMember_Id(Long subscriptionId, Long memberId); List findByMember_Id(Long memberId); + }