🔨 refactor: base-image도 docker hub에 올리는 방법으로 재수정

boostcampwm-2024 · Jan 14, 2025 · 338df41 · 338df41
1 parent 21a317b
commit 338df41
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/boolock-dev-cicd.yml b/.github/workflows/boolock-dev-cicd.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-docker-${{ hashFiles('Dockerfile') }}
+          key: ${{ runner.os }}-docker-${{ hashFiles('Dockerfile', 'Dockerfile.base', 'docker-compose.yml') }}
           restore-keys: |
             ${{ runner.os }}-docker-
 
@@ -51,27 +51,27 @@ jobs:
           echo "${{ secrets.SSL_FULLCHAIN }}" > apps/client/ssl/fullchain.pem
           echo "${{ secrets.SSL_PRIVKEY }}" > apps/client/ssl/privkey.pem
 
-      # - name: Build and Push Base Image
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: .
-      #     file: Dockerfile.base
-      #     push: true
-      #     tags: ${{ secrets.DOCKERHUB_USERNAME }}/base-image:latest
-      #     cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/base-image:latest
-      #     cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/base-image:latest
-      #     outputs: type=docker
-
-      - name: Build Base Image
+      - name: Build and Push Base Image
         uses: docker/build-push-action@v4
         with:
           context: .
           file: Dockerfile.base
-          push: false 
-          tags: base-image:latest
-          cache-from: type=inline
-          cache-to: type=inline
-          load: true
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/base-image:latest
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/base-image:latest
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/base-image:latest
+          outputs: type=docker
+
+      # - name: Build Base Image
+      #   uses: docker/build-push-action@v4
+      #   with:
+      #     context: .
+      #     file: Dockerfile.base
+      #     push: false 
+      #     tags: base-image:latest
+      #     cache-from: type=inline
+      #     cache-to: type=inline
+      #     load: true
 
       - name: Build and Push Frontend Image
         uses: docker/build-push-action@v4
@@ -82,9 +82,8 @@ jobs:
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/boolock_client_test:latest
           cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/boolock_client_test:latest
           cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/boolock_client_test:latest
-          # outputs: type=docker
-          # build-args: |
-          #   DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
+          build-args: |
+            DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
 
       - name: Build and Push Backend Image
         uses: docker/build-push-action@v4
@@ -95,9 +94,8 @@ jobs:
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/boolock_server_test:latest
           cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/boolock_server_test:latest
           cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/boolock_server_test:latest
-          # outputs: type=docker
-          # build-args: |
-          #   DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
+          build-args: |
+            DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
 
   deploy:
     needs: build

diff --git a/apps/client/Dockerfile b/apps/client/Dockerfile
@@ -1,4 +1,5 @@
-FROM base-image AS frontend-build
+ARG DOCKERHUB_USERNAME
+FROM ${DOCKERHUB_USERNAME}/base-image AS frontend-build
 
 WORKDIR /app/apps/client
 COPY ./apps/client .

diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile
@@ -1,4 +1,5 @@
-FROM base-image AS backend-build
+ARG DOCKERHUB_USERNAME
+FROM ${DOCKERHUB_USERNAME}/base-image AS backend-build
 
 WORKDIR /app/apps/server
 COPY ./apps/server .