From 36a27bb83e29c16d465daf0343e4f4ed22f416ab Mon Sep 17 00:00:00 2001
From: Kim minho <90795904+klaus9267@users.noreply.github.com>
Date: Mon, 24 Oct 2022 21:33:11 +0900
Subject: [PATCH] =?UTF-8?q?Refactor(minho/cicd):=20dockerfile,=20compose?=
 =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EC=9D=B4=EB=8F=99=20#113?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main-project/.dockerignore => .dockerignore |  0
 docker-compose.yml                          | 12 ++++++++++++
 dockerfile                                  | 10 ++++++++++
 main-project/Dockerfile                     | 20 --------------------
 main-project/docker-compose.yml             | 12 ------------
 5 files changed, 22 insertions(+), 32 deletions(-)
 rename main-project/.dockerignore => .dockerignore (100%)
 create mode 100644 docker-compose.yml
 create mode 100644 dockerfile
 delete mode 100644 main-project/Dockerfile
 delete mode 100644 main-project/docker-compose.yml

diff --git a/main-project/.dockerignore b/.dockerignore
similarity index 100%
rename from main-project/.dockerignore
rename to .dockerignore
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..fd7844fd
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,12 @@
+version: "3.8"
+
+services:
+    nest:
+        build:
+            context: .
+            dockerfile: ./dockerfile
+        env_file: .env
+        ports:
+            - "3000:3000"
+        container_name: nest-prod
+        restart: always
diff --git a/dockerfile b/dockerfile
new file mode 100644
index 00000000..a3cf8491
--- /dev/null
+++ b/dockerfile
@@ -0,0 +1,10 @@
+FROM node:16.15.1 AS builder
+
+WORKDIR /testDir
+
+COPY ./main-project .
+
+RUN npm install --force
+RUN npm run build
+
+CMD ["npm", "run", "start:prod"]
\ No newline at end of file
diff --git a/main-project/Dockerfile b/main-project/Dockerfile
deleted file mode 100644
index 32fa3f16..00000000
--- a/main-project/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Step 1
-## base image for Step 1: Node 10
-FROM node:16.15.1 AS builder
-WORKDIR /testDir
-## 프로젝트의 모든 파일을 WORKDIR(/app)로 복사한다
-COPY . .
-## Nest.js project를 build 한다
-RUN npm install --force
-RUN npm run build
-
-# Step 2
-## base image for Step 2: Node 10-alpine(light weight)
-FROM node:16.15.1-alpine
-WORKDIR /testDir
-EXPOSE 3000
-
-## Step 1의 builder에서 build된 프로젝트를 가져온다
-COPY --from=builder /testDir ./
-## application 실행
-CMD ["npm", "run", "start:prod"]
\ No newline at end of file
diff --git a/main-project/docker-compose.yml b/main-project/docker-compose.yml
deleted file mode 100644
index 1eb38d7f..00000000
--- a/main-project/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: '3.8'
-
-services:
-  nest:
-    build:
-      context: .
-      dockerfile: ./Dockerfile
-    env_file: .env
-    ports:
-      - '3000:3000'
-    container_name: nest-prod
-    restart: always