From a8edc851839f2a1e7feb53a1a527f65a3a8057e7 Mon Sep 17 00:00:00 2001
From: Alex Tran <alex.tran1502@gmail.com>
Date: Mon, 7 Feb 2022 15:06:30 -0600
Subject: [PATCH] rename docker-minimal to dockerfile as target for github
 action

---
 server/Dockerfile         | 83 +++++++++++++++------------------------
 server/Dockerfile-minimal | 61 ----------------------------
 2 files changed, 32 insertions(+), 112 deletions(-)
 delete mode 100644 server/Dockerfile-minimal

diff --git a/server/Dockerfile b/server/Dockerfile
index 5dc33baf0c..439057f507 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,34 +1,22 @@
-FROM ubuntu:20.04 AS development
+##################################
+# DEVELOPMENT
+##################################
+FROM node:16-bullseye-slim AS development
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /usr/src/app
 
-COPY package.json yarn.lock ./
+COPY package.json package-lock.json ./
 
-RUN apt-get update && apt-get install -y --fix-missing --no-install-recommends \
-  build-essential \
-  curl \
-  git-core \
-  iputils-ping \
-  pkg-config \
-  rsync \
-  software-properties-common \
-  unzip \
-  wget \
-  ffmpeg
+RUN apt-get update
+RUN apt-get install gcc g++ make cmake python3 python3-pip ffmpeg -y
 
-# Install NodeJS
-RUN curl --silent --location https://deb.nodesource.com/setup_14.x | bash -
-RUN apt-get install --yes nodejs
-
-RUN npm i -g yarn
-
-RUN yarn install
+RUN npm install
 
 COPY . .
 
-RUN yarn build
+RUN npm run build
 
 # Clean up commands
 RUN apt-get autoremove -y && apt-get clean && \
@@ -37,44 +25,37 @@ RUN apt-get autoremove -y && apt-get clean && \
 RUN apt-get clean && \
   rm -rf /var/lib/apt/lists/*
 
-FROM ubuntu:20.04 as production
-ARG DEBIAN_FRONTEND=noninteractive
-ARG NODE_ENV=production
-ENV NODE_ENV=${NODE_ENV}
 
-WORKDIR /usr/src/app
 
-COPY package.json yarn.lock ./
+##################################
+# PRODUCTION
+##################################
+# FROM node:16-bullseye-slim as production
+# ARG DEBIAN_FRONTEND=noninteractive
+# ARG NODE_ENV=production
+# ENV NODE_ENV=${NODE_ENV}
 
-RUN apt-get update && apt-get install -y --fix-missing --no-install-recommends \
-  build-essential \
-  curl \
-  git-core \
-  iputils-ping \
-  pkg-config \
-  rsync \
-  software-properties-common \
-  unzip \
-  wget \
-  ffmpeg
+# WORKDIR /usr/src/app
 
-# Install NodeJS
-RUN curl --silent --location https://deb.nodesource.com/setup_14.x | bash -
-RUN apt-get install --yes nodejs
+# COPY package.json yarn.lock ./
 
-RUN npm i -g yarn
+# RUN apt-get update
+# RUN apt-get install gcc g++ make cmake python3 python3-pip ffmpeg -y
 
-RUN yarn install --only=production
+# RUN npm i -g yarn --force
 
-COPY . .
+# RUN yarn install --only=production
 
-COPY --from=development /usr/src/app/dist ./dist
+# COPY . .
 
-# Clean up commands
-RUN apt-get autoremove -y && apt-get clean && \
-  rm -rf /usr/local/src/*
+# COPY --from=development /usr/src/app/dist ./dist
 
-RUN apt-get clean && \
-  rm -rf /var/lib/apt/lists/*
+# # Clean up commands
+# RUN apt-get autoremove -y && apt-get clean && \
+#   rm -rf /usr/local/src/*
 
-CMD ["node", "dist/main"]
\ No newline at end of file
+# RUN apt-get clean && \
+#   rm -rf /var/lib/apt/lists/*
+
+
+# CMD ["node", "dist/main"]
\ No newline at end of file
diff --git a/server/Dockerfile-minimal b/server/Dockerfile-minimal
deleted file mode 100644
index 439057f507..0000000000
--- a/server/Dockerfile-minimal
+++ /dev/null
@@ -1,61 +0,0 @@
-##################################
-# DEVELOPMENT
-##################################
-FROM node:16-bullseye-slim AS development
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-WORKDIR /usr/src/app
-
-COPY package.json package-lock.json ./
-
-RUN apt-get update
-RUN apt-get install gcc g++ make cmake python3 python3-pip ffmpeg -y
-
-RUN npm install
-
-COPY . .
-
-RUN npm run build
-
-# Clean up commands
-RUN apt-get autoremove -y && apt-get clean && \
-  rm -rf /usr/local/src/*
-
-RUN apt-get clean && \
-  rm -rf /var/lib/apt/lists/*
-
-
-
-##################################
-# PRODUCTION
-##################################
-# FROM node:16-bullseye-slim as production
-# ARG DEBIAN_FRONTEND=noninteractive
-# ARG NODE_ENV=production
-# ENV NODE_ENV=${NODE_ENV}
-
-# WORKDIR /usr/src/app
-
-# COPY package.json yarn.lock ./
-
-# RUN apt-get update
-# RUN apt-get install gcc g++ make cmake python3 python3-pip ffmpeg -y
-
-# RUN npm i -g yarn --force
-
-# RUN yarn install --only=production
-
-# COPY . .
-
-# COPY --from=development /usr/src/app/dist ./dist
-
-# # Clean up commands
-# RUN apt-get autoremove -y && apt-get clean && \
-#   rm -rf /usr/local/src/*
-
-# RUN apt-get clean && \
-#   rm -rf /var/lib/apt/lists/*
-
-
-# CMD ["node", "dist/main"]
\ No newline at end of file