From 912bd3ee18f603f02eee363e4a4053f147a52514 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 31 Mar 2020 01:11:34 +0200
Subject: [PATCH] Dockerfile: move nginx config templating to run script

---
 Dockerfile    | 6 ++----
 docker/run.sh | 9 +++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100755 docker/run.sh

diff --git a/Dockerfile b/Dockerfile
index 8415a5eebc..cab9ede03f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,10 +17,8 @@ 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 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;'
+COPY docker/run.sh /usr/local/bin/run.sh
+CMD run.sh
 
 ENV PORT 80
diff --git a/docker/run.sh b/docker/run.sh
new file mode 100755
index 0000000000..7bc5f5fa39
--- /dev/null
+++ b/docker/run.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Run nginx as root
+sed -i 's/user  nginx.*$//' /etc/nginx/nginx.conf
+
+# Write selected env vars to nginx config
+envsubst '$PORT' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
+
+exec nginx -g 'daemon off;'