Bringing it up to standards, ready for master

This commit is contained in:
WilliamMiceli
2018-12-18 23:23:57 -05:00
parent c8de0ea099
commit 5ac76de433

View File

@@ -10,7 +10,7 @@ services:
WORDPRESS_DB_HOST: mysql WORDPRESS_DB_HOST: mysql
WORDPRESS_DB_USER: wordpress_user WORDPRESS_DB_USER: wordpress_user
WORDPRESS_DB_PASSWORD: ${DB_USER_PASS} WORDPRESS_DB_PASSWORD: ${DB_USER_PASS}
WORDPRESS_DB_NAME: wordpress WORDPRESS_DB_NAME: wordpress # Will eventually rename this to "wordpress_db"
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
{{- if .Values.HOST_LABEL}} {{- if .Values.HOST_LABEL}}
@@ -32,18 +32,22 @@ services:
- mysql - mysql
networks: networks:
- public-proxy - public-proxy
{{- if .Values.WEB_PORT}}
ports: ports:
- "${WEB_PORT}:80" - "${WEB_PORT}:80"
{{- end}}
restart: on-failure restart: on-failure
volumes: volumes:
- /RancherCattleData/${DATA_DIR}/Application:/var/www/html - /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
- /RancherCattle/${DATA_DIR}/Application:/var/www/html
mysql: mysql:
image: mysql:5 image: mysql:5
dns: dns:
- 1.1.1.1 - 1.1.1.1
- 1.0.0.1 - 1.0.0.1
environment: environment:
MYSQL_DATABASE: wordpress MYSQL_DATABASE: wordpress # Will eventually rename this to "wordpress_db"
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS} MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
MYSQL_USER: wordpress_user MYSQL_USER: wordpress_user
MYSQL_PASSWORD: ${DB_USER_PASS} MYSQL_PASSWORD: ${DB_USER_PASS}
@@ -52,12 +56,18 @@ services:
{{- if .Values.HOST_LABEL}} {{- if .Values.HOST_LABEL}}
io.rancher.scheduler.affinity:host_label: ${HOST_LABEL} io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
{{- end}} {{- end}}
networks:
db-admin:
aliases:
- wordpress
restart: on-failure restart: on-failure
volumes: volumes:
- /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system - /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 - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
- /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql - /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql
networks: networks:
db-admin:
external: true
public-proxy: public-proxy:
external: true external: true