From 9a5ed723c48c3d2f932b2c28741db4435bdf8fe0 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 31 Mar 2020 00:17:15 +0200
Subject: [PATCH] deployment: merge into root dockerfile

---
 Dockerfile                                    |  9 ++++++-
 deployment/Dockerfile.heroku                  | 24 -------------------
 deployment/default.conf.template              |  8 -------
 .../{default.conf => default.conf.template}   |  3 +--
 4 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 deployment/Dockerfile.heroku
 delete mode 100644 deployment/default.conf.template
 rename docker/{default.conf => default.conf.template} (95%)

diff --git a/Dockerfile b/Dockerfile
index 5337207235..f26f69297b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,11 @@ 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
+
+# Run nginx as root
+RUN sed -i 's/user  nginx.*$//' /etc/nginx/nginx.conf
+
+COPY docker/default.conf.template /etc/nginx/conf.d/default.conf.template
+CMD /bin/bash -c "envsubst '\$PORT' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf" && nginx -g 'daemon off;'
+
+ENV PORT 80
diff --git a/deployment/Dockerfile.heroku b/deployment/Dockerfile.heroku
deleted file mode 100644
index 15878c67da..0000000000
--- a/deployment/Dockerfile.heroku
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM node:12 as builder
-WORKDIR /app
-
-COPY package.json yarn.lock .yarnrc .npmrc /app/
-COPY .yarn /app/.yarn
-COPY packages /app/packages
-COPY plugins /app/plugins
-
-RUN yarn
-
-COPY . .
-
-RUN yarn build
-
-FROM nginx:mainline
-
-COPY --from=builder /app/packages/app/build /usr/share/nginx/html
-
-# Run nginx as root
-RUN sed -i 's/user  nginx.*$//' /etc/nginx/nginx.conf
-
-# Copy in the nginx conf template and replace "$PORT" with the environment variable set by heroku
-COPY deployment/default.conf.template /etc/nginx/conf.d/default.conf.template
-CMD /bin/bash -c "envsubst '\$PORT' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf" && nginx -g 'daemon off;'
diff --git a/deployment/default.conf.template b/deployment/default.conf.template
deleted file mode 100644
index 61c32aa95e..0000000000
--- a/deployment/default.conf.template
+++ /dev/null
@@ -1,8 +0,0 @@
-server {
-  listen $PORT default_server;
-
-  location / {
-    root   /usr/share/nginx/html;
-    index  index.html;
-  }
-}
diff --git a/docker/default.conf b/docker/default.conf.template
similarity index 95%
rename from docker/default.conf
rename to docker/default.conf.template
index d01be24dc7..29252f9625 100644
--- a/docker/default.conf
+++ b/docker/default.conf.template
@@ -1,5 +1,5 @@
 server {
-    listen       80;
+    listen       $PORT;
     server_name  localhost;
 
     #charset koi8-r;
@@ -20,4 +20,3 @@ server {
         root   /usr/share/nginx/html;
     }
 }
-