Merge remote-tracking branch 'skomma/auto-envsubst'

Author: skomma

mainline/alpine/Dockerfile

@@ -147,12 +147,10 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY ldap.conf.template /etc/nginx/conf.d/ldap.conf.template
 COPY nginx.vh.default.conf /etc/nginx/conf.d/default.conf
+COPY nginx-envsubst.sh /usr/bin/nginx-envsubst
 
 EXPOSE 80
 
 STOPSIGNAL SIGTERM
 
-CMD [ \
-  "sh", "-c", \
-  "envsubst '$$NGINX_AUTH_LDAP_URL$$NGINX_AUTH_LDAP_BINDDN$$NGINX_AUTH_LDAP_BINDPW' < /etc/nginx/conf.d/ldap.conf.template > /etc/nginx/conf.d/000-ldap.conf && exec nginx -g 'daemon off;'" \
-]
+CMD ["sh", "-c", "nginx-envsubst && exec nginx -g 'daemon off;'"]

mainline/alpine/nginx-envsubst.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for template in $(find /etc/nginx -name '*.conf.template'); do
+  envsubst "$(printf '${%s} ' $(env | cut -d= -f1))" < $template > ${template%.template}
+done