Back to PostgreSQL, issue was with own infrastructure
This commit is contained in:
@@ -2,14 +2,14 @@ version: '2'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
xwiki:
|
xwiki:
|
||||||
image: xwiki:latest
|
image: xwiki:stable-postgres-tomcat
|
||||||
# container_name: xwiki
|
container_name: xwiki
|
||||||
dns:
|
dns:
|
||||||
- 1.1.1.1
|
- 1.1.1.1
|
||||||
- 1.0.0.1
|
- 1.0.0.1
|
||||||
environment:
|
environment:
|
||||||
DB_HOST: mysql
|
DB_HOST: postgresql
|
||||||
DB_DATABASE: xwiki
|
DB_DATABASE: xwiki_db
|
||||||
DB_USER: xwiki_user
|
DB_USER: xwiki_user
|
||||||
DB_PASSWORD: ${DB_USER_PASS}
|
DB_PASSWORD: ${DB_USER_PASS}
|
||||||
labels:
|
labels:
|
||||||
@@ -33,7 +33,7 @@ services:
|
|||||||
traefik.enable: false
|
traefik.enable: false
|
||||||
{{- end}}
|
{{- end}}
|
||||||
links:
|
links:
|
||||||
- mysql # Using links because "depends_on" does not work in Rancher 1.6
|
- postgresql # Using links because "depends_on" does not work in Rancher 1.6
|
||||||
networks:
|
networks:
|
||||||
- public-proxy
|
- public-proxy
|
||||||
{{- if .Values.WEB_PORT}}
|
{{- if .Values.WEB_PORT}}
|
||||||
@@ -45,17 +45,18 @@ services:
|
|||||||
- /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
|
||||||
- /RancherCattle/${DATA_DIR}/Application:/usr/local/xwiki
|
- /RancherCattle/${DATA_DIR}/Application:/usr/local/xwiki
|
||||||
mysql:
|
postgresql:
|
||||||
image: mysql:5.7
|
image: postgres:alpine
|
||||||
# container_name: mysql
|
container_name: postgresql
|
||||||
dns:
|
dns:
|
||||||
- 1.1.1.1
|
- 1.1.1.1
|
||||||
- 1.0.0.1
|
- 1.0.0.1
|
||||||
environment:
|
environment:
|
||||||
MYSQL_DATABASE: xwiki
|
POSTGRES_INITDB_ARGS: "--encoding=UTF8"
|
||||||
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
|
POSTGRES_DB: xwiki_db
|
||||||
MYSQL_USER: xwiki_user
|
POSTGRES_ROOT_PASSWORD: ${DB_ROOT_PASS}
|
||||||
MYSQL_PASSWORD: ${DB_USER_PASS}
|
POSTGRES_USER: xwiki_user
|
||||||
|
POSTGRES_PASSWORD: ${DB_USER_PASS}
|
||||||
labels:
|
labels:
|
||||||
io.rancher.container.pull_image: always
|
io.rancher.container.pull_image: always
|
||||||
{{- if .Values.HOST_LABEL}}
|
{{- if .Values.HOST_LABEL}}
|
||||||
@@ -69,9 +70,7 @@ services:
|
|||||||
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
|
||||||
# - /RancherCattle/${DATA_DIR}/Configuration/xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf
|
- /RancherCattle/${DATA_DIR}/Database:/var/lib/postgresql/data
|
||||||
- /RancherCattle/${DATA_DIR}/Database:/var/lib/mysql
|
|
||||||
# - /RancherCattle/${DATA_DIR}/Temp:/var/run/mysqld/ # Temporary fix for socket issue
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
db-admin:
|
db-admin:
|
||||||
|
|||||||
Reference in New Issue
Block a user