Merge pull request #7 from zalari/feature/additional_config

add feature to enable additional nginx config

Dockerfile

@@ -21,10 +21,13 @@ MAINTAINER Evan Brown <evanbrown@google.com>
 
 RUN rm /etc/nginx/conf.d/*.conf
 
+RUN mkdir -p /etc/nginx/extra-conf.d
+
 WORKDIR /usr/src
 
 ADD start.sh /usr/src/
 ADD nginx/nginx.conf /etc/nginx/
 ADD nginx/proxy*.conf /usr/src/
+ADD nginx/extra/*.conf /etc/nginx/extra-conf.d/
 
 ENTRYPOINT ./start.sh

README.md

@@ -64,3 +64,19 @@ To run an SSL termination proxy you must have an existing SSL certificate and ke
       -v /path/to/secrets/htpasswd:/etc/secrets/htpasswd \
       nginx-ssl-proxy
     ```
+4. **Add additional nginx config**
+
+   All *.conf from [nginx/extra](nginx/extra) are added during *built* to **/etc/nginx/extra-conf.d** and get included on startup of the container. Using volumes you can overwrite them on *start* of the container:
+
+    ```shell
+    docker run \
+      -e ENABLE_SSL=true \
+      -e TARGET_SERVICE=THE_ADDRESS_OR_HOST_YOU_ARE_PROXYING_TO \
+      -v /path/to/secrets/cert.crt:/etc/secrets/proxycert \
+      -v /path/to/secrets/key.pem:/etc/secrets/proxykey \
+      -v /path/to/secrets/dhparam.pem:/etc/secrets/dhparam \
+      -v /path/to/additional-nginx.conf:/etc/nginx/extra-conf.d/additional_proxy.conf \
+      nginx-ssl-proxy
+    ```
+
+   That way it is possible to setup additional proxies or modifying the nginx configuration.

nginx/extra/empty-for-build.conf

@@ -0,0 +1,2 @@
+#this file is intentionally left emtpy, because
+#otherwise docker-compose or the hub fails the build...

nginx/nginx.conf

@@ -28,4 +28,7 @@ http {
     #gzip  on;
     client_max_body_size 20M;
     include /etc/nginx/conf.d/proxy.conf;
+
+    #additional config
+    include /etc/nginx/extra-conf.d/*;
 }