From bc3dc0510d10b0ad4a5229afa749df0fa4c6eb39 Mon Sep 17 00:00:00 2001
From: seongha <11pi885@gmail.com>
Date: Sun, 5 Jan 2025 15:28:18 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20actions=EC=97=90=20pnpm=20install?=
 =?UTF-8?q?=EC=9D=84=20=EC=BA=90=EC=8B=B1=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/back-media-cd.yml | 12 +++++++++++-
 apps/media/Dockerfile               | 16 ++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/back-media-cd.yml b/.github/workflows/back-media-cd.yml
index 45c5c500..b7dde468 100644
--- a/.github/workflows/back-media-cd.yml
+++ b/.github/workflows/back-media-cd.yml
@@ -29,6 +29,14 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
 
+      - name: 🔄 캐시 복원
+        uses: actions/cache@v3
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-
+
       - name: ⬇️ 의존성 설치
         run: pnpm install --frozen-lockfile
 
@@ -65,8 +73,10 @@ jobs:
       - name: 🐳 Docker 빌드 및 푸시
         run: |
           echo "Starting Docker build..."
-          DOCKER_BUILDKIT=1 docker buildx build --progress=plain --no-cache -f apps/media/Dockerfile . -t my-media-app
+          DOCKER_BUILDKIT=1 docker buildx build --progress=plain --build-arg PNPM_CACHE_DIR=/root/.pnpm-store -f apps/media/Dockerfile . -t my-media-app
+
           echo "Docker build completed."
+
       - name: 🐳 Docker 실행
         run: |
           echo "Starting Docker container..."
diff --git a/apps/media/Dockerfile b/apps/media/Dockerfile
index 00dfa342..aa539dde 100644
--- a/apps/media/Dockerfile
+++ b/apps/media/Dockerfile
@@ -20,7 +20,11 @@ RUN pnpm install -g turbo@^2.2.3
 
 # 의존성 파일만 우선 복사하여 캐시 활용
 COPY package.json pnpm-lock.yaml ./
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm install --frozen-lockfile
+
+# PNPM 캐시 디렉토리 전달
+ARG PNPM_CACHE_DIR=/pnpm/store
+RUN pnpm install --frozen-lockfile --store=${PNPM_CACHE_DIR}
+
 
 # 소스 파일 전체 복사
 COPY . .
@@ -38,15 +42,15 @@ WORKDIR /app
 COPY --from=builder /app/out/json/ .
 COPY --from=builder /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 
-# 캐시 활용하여 의존성 설치
-RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store pnpm install --frozen-lockfile
+
+# PNPM 캐시 디렉토리 전달
+ARG PNPM_CACHE_DIR=/pnpm/store
+RUN pnpm install --frozen-lockfile --store=${PNPM_CACHE_DIR}
 
 # 전체 소스 복사 및 빌드
 COPY --from=builder /app/out/full/ .
 
-# 이곳에서 캐시를 활용하여 C++ 모듈의 컴파일 결과를 캐싱합니다.
-RUN --mount=type=cache,id=build-cache,target=/root/.cache \
-    pnpm build:media
+RUN pnpm build:media
 
 # 환경 파일 복사
 COPY --from=builder /app/apps/media/.env /app/apps/media/dist/.env