Merge branch 'develop/nginx'

# Conflicts:
#	templates/Nginx/0/docker-compose.yml

templates/Nginx/0/README.md

@@ -1,10 +1,5 @@
 # Nginx
 
-### Will continue this in the future
-
-https://store.docker.com/_/nginx
-
-
 ### Full Example nginx.conf
 https://www.nginx.com/resources/wiki/start/topics/examples/full/
 

templates/Nginx/0/docker-compose.yml

@@ -2,8 +2,8 @@ version: '2'
 
 services:
   nginx:
-    image: nginx:alpine
+    image: nginx:${IMAGE_TAG}
-    dns:
+    dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
     labels:
@@ -16,7 +16,7 @@ services:
       ### Start Web Segment
       traefik.frontend.entryPoints: http,https
       traefik.frontend.headers.forceSTSHeader: true
-      traefik.frontend.headers.referrerPolicy: no-referrer
+      traefik.frontend.headers.referrerPolicy: no-referrer # Security enhancement (Prevents leaking of referer information)
       traefik.frontend.headers.SSLRedirect: true
       traefik.frontend.headers.STSPreload: true
       traefik.frontend.headers.STSSeconds: 15552000
@@ -24,16 +24,11 @@ services:
       traefik.frontend.rule: Host:${TRAEFIK_HOST}
       traefik.port: "80"
       ### End Web Segment
-      {{- else}}
-      traefik.enable: false
-      {{- end}}
-    {{- if .Values.WEB_PORT}}
-    ports:
-      - "${WEB_PORT}:80"
-    {{- end}}
     restart: on-failure
     volumes:
+      - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
       {{- if eq .Values.PERSIST_CONF "true"}}
       - /RancherCattle/${DATA_DIR}/Configuration:/etc/nginx
       {{- end}}
-      - /RancherCattle/${DATA_DIR}/HTML:/usr/share/nginx/html
+      - /RancherCattle/${DATA_DIR}/HTML:/usr/share/nginx/html

templates/Nginx/0/rancher-compose.yml

@@ -20,24 +20,28 @@ catalog:
       label: "Public Host Domain"
       description: |
         The host that Traefik will use to provide public access.
-        Leaving this empty will disable Traefik on this stack.
       default: "subdomain.domain.tld"
       required: false
       type: string
 
-    - variable: "WEB_PORT"
+    - variable: "IMAGE_TAG"
-      label: "Web Port"
+      label: "Image Tag"
       description: |
-        The port to locally access the web interface on.
+        The image tag to use for the desired container variant.
-        Leaving this empty will disable opening any port on the host system.
+      default: "latest"
-      default: "11000"
+      required: true
-      required: false
+      type: enum
-      type: int
+      options:
+        - "latest"
+        - "alpine"
+        - "perl"
+        - "alpine-perl"
+        - "stable"
 
     - variable: "PERSIST_CONF"
       label: "Persistent Configuration"
       description: |
-        Have a persistent congiguration directory.
+        Mount a persistent congiguration directory.
       default: true
       required: true
       type: boolean