From f210e2be222e2f5cb2c6abc9aa2e39e17842a64d Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Thu, 13 Dec 2018 11:48:49 -0500 Subject: [PATCH 1/3] String works better in the interface --- templates/Nginx/0/rancher-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Nginx/0/rancher-compose.yml b/templates/Nginx/0/rancher-compose.yml index e569f26..d41d1ce 100644 --- a/templates/Nginx/0/rancher-compose.yml +++ b/templates/Nginx/0/rancher-compose.yml @@ -32,7 +32,7 @@ catalog: Leaving this empty will disable opening any port on the host system. default: "11000" required: false - type: int + type: string - variable: "PERSIST_CONF" label: "Persistent Configuration" From f59e8115a29ed0b6efaaf094beafbf192818ba7f Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Thu, 13 Dec 2018 11:54:28 -0500 Subject: [PATCH 2/3] Started option to allow tag changes --- templates/Nginx/0/README.md | 10 +++++++++- templates/Nginx/0/rancher-compose.yml | 12 ++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/templates/Nginx/0/README.md b/templates/Nginx/0/README.md index 3fa3929..5cfa85e 100644 --- a/templates/Nginx/0/README.md +++ b/templates/Nginx/0/README.md @@ -6,4 +6,12 @@ https://store.docker.com/_/nginx ### Full Example nginx.conf -https://www.nginx.com/resources/wiki/start/topics/examples/full/ \ No newline at end of file +https://www.nginx.com/resources/wiki/start/topics/examples/full/ + + +### IMAGE_TAG Not Yet Complete +Will finish and test later + + +### To-Dos +* List common differences between regular images and Alpine images \ No newline at end of file diff --git a/templates/Nginx/0/rancher-compose.yml b/templates/Nginx/0/rancher-compose.yml index d41d1ce..8a536ed 100644 --- a/templates/Nginx/0/rancher-compose.yml +++ b/templates/Nginx/0/rancher-compose.yml @@ -25,6 +25,18 @@ catalog: required: false type: string + - variable: "IMAGE_TAG" + label: "Base Image" + description: | + Which base image would you like to use. + default: "11000" + required: true + type: enum + options: + - + - Latest (Default) + - Latest (Alpine) + - variable: "WEB_PORT" label: "Web Port" description: | From 76b478a39dd5209bf3993398f1db57c3615ca187 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Sat, 9 Feb 2019 17:38:38 -0500 Subject: [PATCH 3/3] Finished configuration --- templates/Nginx/0/README.md | 15 +-------------- templates/Nginx/0/docker-compose.yml | 24 +++++++----------------- templates/Nginx/0/rancher-compose.yml | 26 +++++++++----------------- 3 files changed, 17 insertions(+), 48 deletions(-) diff --git a/templates/Nginx/0/README.md b/templates/Nginx/0/README.md index 5cfa85e..93c33f4 100644 --- a/templates/Nginx/0/README.md +++ b/templates/Nginx/0/README.md @@ -1,17 +1,4 @@ # 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/ - - -### IMAGE_TAG Not Yet Complete -Will finish and test later - - -### To-Dos -* List common differences between regular images and Alpine images \ No newline at end of file +https://www.nginx.com/resources/wiki/start/topics/examples/full/ \ No newline at end of file diff --git a/templates/Nginx/0/docker-compose.yml b/templates/Nginx/0/docker-compose.yml index 0ac72a2..a9af65f 100644 --- a/templates/Nginx/0/docker-compose.yml +++ b/templates/Nginx/0/docker-compose.yml @@ -2,8 +2,8 @@ version: '2' services: nginx: - image: nginx:alpine - dns: + image: nginx:${IMAGE_TAG} + dns: # Using Cloudflare DNS - 1.1.1.1 - 1.0.0.1 labels: @@ -16,29 +16,19 @@ 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 + traefik.frontend.passHostHeader: true traefik.frontend.rule: Host:${TRAEFIK_HOST} traefik.port: "80" ### End Web Segment - {{- else}} - traefik.enable: false - {{- end}} - networks: - - public-proxy - {{- 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 - -networks: - public-proxy: - external: true \ No newline at end of file + - /RancherCattle/${DATA_DIR}/HTML:/usr/share/nginx/html \ No newline at end of file diff --git a/templates/Nginx/0/rancher-compose.yml b/templates/Nginx/0/rancher-compose.yml index 8a536ed..05a90d8 100644 --- a/templates/Nginx/0/rancher-compose.yml +++ b/templates/Nginx/0/rancher-compose.yml @@ -20,36 +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: "IMAGE_TAG" - label: "Base Image" + label: "Image Tag" description: | - Which base image would you like to use. - default: "11000" + The image tag to use for the desired container variant. + default: "latest" required: true type: enum options: - - - - Latest (Default) - - Latest (Alpine) - - - variable: "WEB_PORT" - label: "Web Port" - description: | - The port to locally access the web interface on. - Leaving this empty will disable opening any port on the host system. - default: "11000" - required: false - type: string + - "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