Experimental setup with dedicated httpd service

This commit is contained in:
WilliamMiceli
2018-11-17 15:41:43 -05:00
parent 647281839e
commit f4af177a69
2 changed files with 47 additions and 33 deletions

View File

@@ -1,8 +1,48 @@
version: '2'
services:
httpd:
image: httpd:alpine
dns:
- 1.1.1.1
- 1.0.0.1
labels:
io.rancher.container.pull_image: always
{{- if .Values.HOST_LABEL}}
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
{{- end}}
{{- if .Values.TRAEFIK_HOST}}
traefik.enable: true
traefik.frontend.rule: Host:${TRAEFIK_HOST}
traefik.frontend.entryPoints: http # ,https
# traefik.frontend.headers.forceSTSHeader: true
# traefik.frontend.headers.SSLRedirect: true
# traefik.frontend.headers.STSPreload: true
# traefik.frontend.headers.STSSeconds: 15552000
traefik.port: "80"
{{- else}}
traefik.enable: false
{{- end}}
links:
- mysql
- nextcloud
{{- if eq .Values.REDIS "true"}}
- redis
{{- end}}
networks:
- public-proxy
ports:
- "${WEB_PORT}:80"
restart: on-failure
volumes:
- /RancherCattleData/${DATA_DIR}/Application:/usr/local/apache2/htdocs
- /RancherCattleConfig/${DATA_DIR}/httpd:/usr/local/apache2/conf
- /RancherCattleData/${DATA_DIR}/Application:/var/www/html
- /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql
- /RancherCattleData/${DATA_DIR}/UserData:/var/www/html/data
nextcloud:
image: nextcloud:stable-apache
image: nextcloud:fpm-alpine
dns:
- 1.1.1.1
- 1.0.0.1
@@ -18,31 +58,11 @@ services:
{{- if .Values.HOST_LABEL}}
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
{{- end}}
{{- if .Values.TRAEFIK_HOST}}
traefik.enable: true
traefik.frontend.rule: Host:${TRAEFIK_HOST}
traefik.frontend.entryPoints: http,https
traefik.frontend.headers.forceSTSHeader: true
traefik.frontend.headers.SSLRedirect: true
traefik.frontend.headers.STSPreload: true
traefik.frontend.headers.STSSeconds: 15552000
traefik.port: "80"
{{- else}}
traefik.enable: false
{{- end}}
links:
- mysql
{{- if eq .Values.REDIS "true"}}
- redis
{{- end}}
networks:
- public-proxy
ports:
- "${WEB_PORT}:80"
restart: on-failure
volumes:
- /RancherCattleData/${DATA_DIR}/Application:/var/www/html
- /RancherCattleData/${DATA_DIR}/UserData:/var/www/html/data
volumes-from:
- httpd
mysql:
image: mysql:5
dns:
@@ -60,7 +80,9 @@ services:
{{- end}}
restart: on-failure
volumes:
- /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql
volumes-from:
- httpd
{{- if eq .Values.REDIS "true"}}
redis:
image: redis:latest

View File

@@ -77,20 +77,12 @@ catalog:
label: "Data Directory"
description: |
The directory to store persistent data for the stack.
default: "Personal/Nextcloud"
default: "Personal/Nextcloud-Experimental"
required: true
type: string
services:
nextcloud:
scale: 1
# health_check:
# port: ${HOST_HTTP_PORT}
# request_line: GET /healthcheck HTTP/1.0
# interval: 5000
# response_timeout: 2000
# healthy_threshold: 2
# unhealthy_threshold: 3
# strategy: none
mysql:
scale: 1