v1.3.0 (#16)

Major updates
* Updating base image version

Minor updates
* Trimming whitespace
* Renaming template files

Documentation updates
* Adding proxy-params-websockets.conf to README

Author: bfren

.github/workflows/build-dev.yml

@@ -22,7 +22,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/build-main.yml

@@ -32,7 +32,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

Dockerfile

@@ -1,4 +1,5 @@
-FROM bcgdesign/nginx:alpine-3.13-1.2.4
+#FROM bcgdesign/nginx:alpine-3.13-1.3.0
+FROM bcgdesign/nginx:dev
 
 LABEL maintainer="Ben Green <[email protected]>" \
     org.label-schema.name="Nginx Proxy" \

README.md

@@ -56,11 +56,12 @@ For SSL certificate requests to work correctly, ports 80 and 443 need mapping fr
 
 The image contains a handful of useful Nginx configuration 'helper' files, which you can find in `/overlay/etc/nginx/helpers`.
 
-| Helper                | Description                                                                                                      |
-| --------------------- | ---------------------------------------------------------------------------------------------------------------- |
-| `proxy-params.conf`   | Headers commonly required when proxying a site.                                                                  |
-| `secure-headers.conf` | Standard secure headers - see [Mozilla SSL Configuration Generator](https://ssl-config.mozilla.org/).            |
-| `tls1_3-only.conf`    | If you want to be ultra-secure (and not support older browsers), this will disable all TLS protocols except 1.3. |
+| Helper                            | Description                                                                                                      |
+| --------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
+| `proxy-params.conf`               | Headers commonly required when proxying a site.                                                                  |
+| `proxy-params-websockets.conf`    | Headers required to use websockets.                                                                              |
+| `secure-headers.conf`             | Standard secure headers - see [Mozilla SSL Configuration Generator](https://ssl-config.mozilla.org/).            |
+| `tls1_3-only.conf`                | If you want to be ultra-secure (and not support older browsers), this will disable all TLS protocols except 1.3. |
 
 ## Authors
 

VERSION

@@ -1 +1 @@
-1.2.8
+1.3.0

overlay/etc/periodic/daily/update-certs

@@ -1,2 +1,10 @@
 #!/usr/bin/with-contenv bash
+
+set -euo pipefail
+
+
+#======================================================================================================================
+# Run SSL update executable and log output to /ssl directory
+#======================================================================================================================
+
 ssl-update > ${SSL}/update.log

overlay/etc/ssl/inc/setup-global.sh

@@ -10,7 +10,7 @@ setup_global () {
         _echo " .. creating global configuration file..."
         gomplate \
             -o ${SSL_GLOBAL_CFG} \
-            -f ${TEMPLATES}/global.conf.tmpl
+            -f ${TEMPLATES}/getssl-global.conf.tmpl
     fi
 
     if [ ! -f ${SSL_DHPARAM} ] ; then

overlay/etc/ssl/inc/setup-nginx.sh

@@ -52,6 +52,6 @@ setup_nginx () {
     # generate site configuration
     gomplate \
         -o ${CONF} \
-        -f ${TEMPLATES}/site.conf.tmpl
+        -f ${TEMPLATES}/nginx-site.conf.tmpl
 
 }