Merge branch 'earndt-work-on-configs' into 'dev'

[AFP-108] 👷 Makes changes to Dockerfile for Azure deployment [@earndt]

See merge request !13

Dockerfile

-FROM node:13.12.0-alpine as build
+FROM node:14.16-alpine3.13 as build
 WORKDIR /app
 ENV PATH /app/node_modules/.bin:$PATH
-COPY package.json ./
-COPY package-lock.json ./
-RUN npm ci
-RUN npm install react-scripts@3.4.1 -g
-COPY . ./
-RUN npm run build
+COPY . .
+RUN yarn
+RUN yarn build
 
 FROM nginx:stable-alpine
 COPY --from=build /app/build /usr/share/nginx/html
-COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /app/nginx/nginx.conf /etc/nginx/conf.d/default.conf
 EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+CMD ["nginx", "-g", "daemon off;"]
+
+####BELOW IS FOR TESTING ONLY, DO NOT UNCOMMENT
+#FROM node:13.12.0-alpine as build
+#WORKDIR /app
+#ENV PATH /app/node_modules/.bin:$PATH
+#COPY package.json ./
+#COPY package-lock.json ./
+#RUN npm ci
+#RUN npm install react-scripts@3.4.1 -g
+#COPY . ./
+#RUN npm run build
+
+#FROM nginx:stable-alpine
+#COPY --from=build /app/build /usr/share/nginx/html
+#COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
+#EXPOSE 80
+#CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file

nginx/nginx.conf

+
 server {
+listen 80;
+location / {
+root /usr/share/nginx/html;
+index index.html index.htm;
+try_files $uri $uri/ /index.html =404;
+}
+}
 
-  listen 80;
+# server {
+#
+#   listen 80;
 
-  location / {
-    root   /usr/share/nginx/html;
-    index  index.html index.htm;
-    try_files $uri $uri/ /index.html;
-  }
+#   location / {
+#     root   /usr/share/nginx/html;
+#     index  index.html index.htm;
+#     try_files $uri $uri/ /index.html;
+#   }
 
-  error_page   500 502 503 504  /50x.html;
+#   error_page   500 502 503 504  /50x.html;
 
-  location = /50x.html {
-    root   /usr/share/nginx/html;
-  }
+#   location = /50x.html {
+#     root   /usr/share/nginx/html;
+#   }
 
-}
\ No newline at end of file
+# }
\ No newline at end of file