Merge pull request #87 from boostcampwm-2024/develop

refactor: docker hub 주소 변경

Author: ezcolin2

Diff for: .github/workflows/auto-assign-merge.yml

@@ -34,35 +34,35 @@ jobs:
       # 그리고 layer 수가 너무 많으면 node:20-alpine 버전 사용 (50개 이상)
       - name: package docker image build and push
         run: |
-          STATUS=$(curl -s -o /dev/null -w "%{http_code}" https://hub.docker.com/v2/repositories/summersummerwhy/octodocs-modules)
+          STATUS=$(curl -s -o /dev/null -w "%{http_code}" https://hub.docker.com/v2/repositories/growth123/octodocs-modules)
           if [ "$STATUS" -eq 404 ]; then
             echo "octodocs-modules not found"
-            docker build -f ./services/module/Dockerfile.init -t summersummerwhy/octodocs-modules .
+            docker build -f ./services/module/Dockerfile.init -t growth123/octodocs-modules .
 
           else
             echo "octodocs-modules found"
-            docker build -f ./services/module/Dockerfile -t summersummerwhy/octodocs-modules .
-            LAYERS=$(docker inspect --format '{{len .RootFS.Layers}}' summersummerwhy/octodocs-modules)
+            docker build -f ./services/module/Dockerfile -t growth123/octodocs-modules .
+            LAYERS=$(docker inspect --format '{{len .RootFS.Layers}}' growth123/octodocs-modules)
               if [ $LAYERS -gt 50 ]; then
                 echo "too many layers"
-                docker build -f ./services/module/Dockerfile.init -t summersummerwhy/octodocs-modules .
+                docker build -f ./services/module/Dockerfile.init -t growth123/octodocs-modules .
               fi
           fi
       # Docker 이미지 빌드
       - name: docker image build
         run: |
-          docker build -f ./services/backend/Dockerfile.prod -t summersummerwhy/octodocs-backend . &
-          docker build -f ./services/nginx/Dockerfile.prod -t summersummerwhy/octodocs-nginx . &
-          docker build -f ./services/websocket/Dockerfile.prod -t summersummerwhy/octodocs-websocket . &
+          docker build -f ./services/backend/Dockerfile.prod -t growth123/octodocs-backend . &
+          docker build -f ./services/nginx/Dockerfile.prod -t growth123/octodocs-nginx . &
+          docker build -f ./services/websocket/Dockerfile.prod -t growth123/octodocs-websocket . &
           wait
 
       # Docker 이미지 푸시
       - name: docker image push
         run: |
-          docker push summersummerwhy/octodocs-modules &
-          docker push summersummerwhy/octodocs-backend &
-          docker push summersummerwhy/octodocs-nginx &
-          docker push summersummerwhy/octodocs-websocket &
+          docker push growth123/octodocs-modules &
+          docker push growth123/octodocs-backend &
+          docker push growth123/octodocs-nginx &
+          docker push growth123/octodocs-websocket &
           wait
 
   deploy:
@@ -85,7 +85,7 @@ jobs:
 
           ssh -o StrictHostKeyChecking=no $REMOTE_USER@$REMOTE_HOST << 'EOF'
             cd /root/octodocs
-            docker pull summersummerwhy/octodocs-modules
+            docker pull growth123/octodocs-modules
             docker-compose -f compose.prod.yml pull
       - name: deploy
         env:

Diff for: .github/workflows/cd-pipeline.yml

@@ -5,16 +5,16 @@ services:
     build:
       context: .
       dockerfile: ./services/nginx/Dockerfile.prod
-    image: summersummerwhy/octodocs-nginx
+    image: growth123/octodocs-nginx
 
   backend:
     build:
       context: .
       dockerfile: ./services/backend/Dockerfile.prod
-    image: summersummerwhy/octodocs-backend
+    image: growth123/octodocs-backend
 
   websocket:
     build:
       context: .
       dockerfile: ./services/websocket/Dockerfile.prod
-    image: summersummerwhy/octodocs-websocket
+    image: growth123/octodocs-websocket

Diff for: compose.prod.override.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   nginx:
-    image: summersummerwhy/octodocs-nginx:latest
+    image: growth123/octodocs-nginx:latest
     env_file:
       - .env.server
     restart: always
@@ -21,7 +21,7 @@ services:
         condition: service_healthy
 
   backend:
-    image: summersummerwhy/octodocs-backend:latest
+    image: growth123/octodocs-backend:latest
     env_file:
       - .env.server
     expose:
@@ -49,7 +49,7 @@ services:
     restart: always
 
   websocket:
-    image: summersummerwhy/octodocs-websocket:latest
+    image: growth123/octodocs-websocket:latest
     env_file:
       - .env.server
     expose:

Diff for: compose.prod.yml

@@ -1,4 +1,4 @@
-FROM summersummerwhy/octodocs-modules:latest
+FROM growth123/octodocs-modules:latest
 
 # 소스 코드 복사
 COPY . .
@@ -7,7 +7,7 @@ WORKDIR /app/apps/backend
 
 
 # 빌드
-RUN yarn build
+RUN apt update && apt install wget -y && yarn build
 
 # 프로덕션 모드로 실행
 ENV NODE_ENV=production

Diff for: services/backend/Dockerfile.prod

@@ -14,10 +14,11 @@ COPY apps/websocket/package.json ./apps/websocket/
 # node_modules를 가지고 있는 이미지
 # 이 이미지를 기반으로 각 workspace 별 이미지를 만들면 
 # yarn install 레이어를 공유하게 된다.
-FROM summersummerwhy/octodocs-modules:latest
+FROM growth123/octodocs-modules:latest
 
 # 호이스팅을 위해
-COPY --from=builder /app/apps /app/apps
+COPY --from=builder /app /app
+WORKDIR /app
 
 # 의존성 설치
-RUN yarn install --check-files
+RUN yarn install --check-files && yarn cache clean

Diff for: services/module/Dockerfile

@@ -14,10 +14,11 @@ COPY apps/websocket/package.json ./apps/websocket/
 # node_modules를 가지고 있는 이미지
 # 이 이미지를 기반으로 각 workspace 별 이미지를 만들면 
 # yarn install 레이어를 공유하게 된다.
-FROM node:20-alpine
+FROM node:20-slim
 
 # 호이스팅을 위해
-COPY --from=builder /app/apps /app/apps
+COPY --from=builder /app /app
+WORKDIR /app
 
 # 의존성 설치
-RUN yarn install --check-files
+RUN yarn install --check-files && yarn cache clean

Diff for: services/module/Dockerfile.init

@@ -1,5 +1,5 @@
 # 빌드 스테이지
-FROM summersummerwhy/octodocs-modules:latest as builder
+FROM growth123/octodocs-modules:latest as builder
 
 # 소스 코드 복사
 COPY . .

Diff for: services/nginx/Dockerfile.prod

@@ -1,12 +1,12 @@
-FROM summersummerwhy/octodocs-modules:latest
+FROM growth123/octodocs-modules:latest
 
 # 소스 코드 복사 
 COPY . .
 
 WORKDIR /app/apps/websocket
 
 # 빌드
-RUN yarn build
+RUN apt update && apt install wget -y && yarn build
 
 # 프로덕션 모드로 실행
 ENV NODE_ENV=production