From e3843a90ced50b504e43bdc73c2ee2dca28e0d8f Mon Sep 17 00:00:00 2001
From: Vern Burton <me@vernburton.com>
Date: Sun, 22 Mar 2020 21:28:58 -0500
Subject: [PATCH 1/2] Creating docker-compose.yml with nginx config via a new
 site.

---
 docker-compose.yml    | 21 +++++++++++++++++++++
 docker/backstage.conf |  9 +++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 docker-compose.yml
 create mode 100644 docker/backstage.conf

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000..90c2e6d395
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,21 @@
+version: '3.7'
+services:
+  app:
+    volumes:
+      - app_dir:/app/packages/app/build
+    build: .
+
+  web:
+    ports:
+      - 8080:80
+    volumes:
+      - ./docker/backstage.conf:/etc/nginx/conf.d/backstage.conf
+      - type: volume
+        source: app_dir
+        target: /usr/share/backstage/html
+        volume:
+          nocopy: true
+    image: nginx:mainline
+
+volumes:
+  app_dir:
\ No newline at end of file
diff --git a/docker/backstage.conf b/docker/backstage.conf
new file mode 100644
index 0000000000..b309ab0b01
--- /dev/null
+++ b/docker/backstage.conf
@@ -0,0 +1,9 @@
+server {
+   listen 80 default_server;
+   root /usr/share/backstage/html;
+   server_name backstage.local;
+   index index.html index.htm;
+   location / {
+       try_files $uri /index.html;
+   }
+}
\ No newline at end of file

From 894d25b54b5d0c908003626c2a07d6391597e836 Mon Sep 17 00:00:00 2001
From: Vern Burton <me@vernburton.com>
Date: Sat, 28 Mar 2020 18:40:28 -0500
Subject: [PATCH 2/2] updating Dockerfile to pull in custom default.conf to
 overload default file.

---
 Dockerfile            |  1 +
 docker-compose.yml    | 21 ---------------------
 docker/backstage.conf |  9 ---------
 docker/default.conf   | 23 +++++++++++++++++++++++
 4 files changed, 24 insertions(+), 30 deletions(-)
 delete mode 100644 docker-compose.yml
 delete mode 100644 docker/backstage.conf
 create mode 100644 docker/default.conf

diff --git a/Dockerfile b/Dockerfile
index 39d51a35f2..5337207235 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,3 +15,4 @@ RUN yarn build
 FROM nginx:mainline
 
 COPY --from=builder /app/packages/app/build /usr/share/nginx/html
+COPY ./docker/default.conf /etc/nginx/conf.d/default.conf
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 90c2e6d395..0000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: '3.7'
-services:
-  app:
-    volumes:
-      - app_dir:/app/packages/app/build
-    build: .
-
-  web:
-    ports:
-      - 8080:80
-    volumes:
-      - ./docker/backstage.conf:/etc/nginx/conf.d/backstage.conf
-      - type: volume
-        source: app_dir
-        target: /usr/share/backstage/html
-        volume:
-          nocopy: true
-    image: nginx:mainline
-
-volumes:
-  app_dir:
\ No newline at end of file
diff --git a/docker/backstage.conf b/docker/backstage.conf
deleted file mode 100644
index b309ab0b01..0000000000
--- a/docker/backstage.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-server {
-   listen 80 default_server;
-   root /usr/share/backstage/html;
-   server_name backstage.local;
-   index index.html index.htm;
-   location / {
-       try_files $uri /index.html;
-   }
-}
\ No newline at end of file
diff --git a/docker/default.conf b/docker/default.conf
new file mode 100644
index 0000000000..d01be24dc7
--- /dev/null
+++ b/docker/default.conf
@@ -0,0 +1,23 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    #charset koi8-r;
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri /index.html;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
+