From acd02deb0816010fa5f30578d307419da8284f5a Mon Sep 17 00:00:00 2001
From: Blair Vanderlugt <blair.vanderlugt@gmail.com>
Date: Sat, 10 Apr 2021 12:17:16 -0700
Subject: [PATCH] builds for docker

---
 Dockerfile | 12 ++++++------
 nginx.conf | 47 ++++++++++++++++++++++++++++++++++++++++-------
 set-env.ts |  4 ----
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1d8fa2a..39ebebe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,3 @@
-### STAGE 1: Build ###
 # defining version of the base image
 FROM node:alpine as build
 
@@ -6,15 +5,16 @@ FROM node:alpine as build
 WORKDIR /app
 
 # copying the json files into the image
-COPY package*.json ./
+COPY package*.json .
+COPY patch-webpack.js .
 
 RUN npm install
-
 # copying rest of project
+
 COPY . .
 
 # running build script
-RUN npm run build --prod
+RUN npm run build:prod
 
 ### STAGE 2: Setup ###
 # defining nginx image version
@@ -27,8 +27,8 @@ RUN rm -rf /usr/share/nginx/html/*
 COPY --from=build /app/dist/cic-staff-client /usr/share/nginx/html
 
 # copy nginx configuration file
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+COPY nginx.conf /etc/nginx/
 
-EXPOSE 80 443
+EXPOSE 80
 
 CMD [ "nginx", "-g", "daemon off;" ]
diff --git a/nginx.conf b/nginx.conf
index 1a12d7b..7cdc644 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,8 +1,41 @@
-server {
-  listen 80;
-  location / {
-      root /usr/share/nginx/html;
-      index index.html index.htm;
-      try_files $uri $uri/ /index.html =404;
-  }
+
+user  nginx;
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+
+    server {
+      listen 80;
+      location / {
+          root /usr/share/nginx/html;
+          index index.html index.htm;
+          try_files $uri $uri/ /index.html =404;
+      }
+    }
 }
diff --git a/set-env.ts b/set-env.ts
index fce0e37..754d897 100644
--- a/set-env.ts
+++ b/set-env.ts
@@ -36,10 +36,6 @@ function setConfigs(configs): void {
   });
 }
 
-if (!process.env.CIC_REGISTRY_ADDRESS) {
-  console.error(colors.red('All the required environment variables were not provided!'));
-  process.exit(-1);
-}
 
 if (isProduction) {
   console.log(colors.cyan('Running in production environment!'));