From 9c0de8c92cfd7824e4a18dc1d1bf175232f1429d Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 2 Feb 2021 16:10:36 +0000 Subject: [PATCH] Fix startup template config path and omission from Dockerfile --- Dockerfile | 1 + entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 93e4f19..53693c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,7 @@ ADD entrypoint.sh /entrypoint.sh ADD render-template.sh /usr/local/bin/render-template.sh ADD nginx/nginx.conf /etc/nginx/nginx.conf ADD nginx/snikket-common.template /etc/nginx/templates/snikket-common +ADD nginx/startup.template /etc/nginx/templates/startup ADD nginx/http.template /etc/nginx/templates/http ADD nginx/https.template /etc/nginx/templates/https ADD supervisord.conf /etc/supervisord/supervisord.conf diff --git a/entrypoint.sh b/entrypoint.sh index 5e938f7..3f5b801 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -9,7 +9,7 @@ if test -f "$CERT_PATH"; then /usr/local/bin/render-template.sh "/etc/nginx/templates/$proto" "/etc/nginx/sites-enabled/$proto"; done else - /usr/local/bin/render-template.sh "/etc/nginx/templates/startup.template" "/etc/nginx/sites-enabled/startup"; + /usr/local/bin/render-template.sh "/etc/nginx/templates/startup" "/etc/nginx/sites-enabled/startup"; fi exec supervisord -c /etc/supervisord/supervisord.conf