From: Michael Brown <supermathie@gmail.com>
Date: Thu, 9 Apr 2020 18:54:01 +0000 (-0400)
Subject: Revert "Remove nginx-common package"
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=70a33234631fea8a6b04d2fdef507c178fc19272;p=discourse_docker.git

Revert "Remove nginx-common package"

This reverts commit 30e0c58d1dd851a00bf7decc6182e3948c10a545.

* turns out we do depend on the default nginx.conf and directories provided by the distribution package
* notably /etc/nginx.conf and /etc/nginx/conf.d
---

diff --git a/image/base/install-nginx b/image/base/install-nginx
index 1b68e55..0211234 100755
--- a/image/base/install-nginx
+++ b/image/base/install-nginx
@@ -21,8 +21,8 @@ echo "$HASH nginx-$VERSION.tar.gz" | sha256sum -c
 tar zxf nginx-$VERSION.tar.gz
 cd nginx-$VERSION
 
-# build dependencies
-apt install -y libpcre3 libpcre3-dev zlib1g zlib1g-dev
+# nginx-common for boilerplate files etc.
+apt install -y nginx-common libpcre3 libpcre3-dev zlib1g zlib1g-dev
 
 cd /tmp
 # this is the reason we are compiling by hand...