Merge branch 'master' into dev

ATNU · Feb 14, 2020 · d9ec465 · d9ec465
2 parents 8336864 + bb05c22
commit d9ec465
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -9,6 +9,6 @@ RUN ng build --prod="true"
 
 FROM nginx:alpine
 COPY --from=builder /usr/local/app/dist/* /usr/share/nginx/html
-RUN ls /usr/share/nginx/html
+COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 
 
diff --git a/nginx/default.conf b/nginx/default.conf
@@ -0,0 +1,6 @@
+server {
+    location / {
+        root /usr/share/nginx/html;
+        try_files $uri $uri/ /index.html =404;
+    }
+}