Removed use of rancher-nfs and use data containers instead.

This commit is contained in:
Kevin Xu 2016-12-15 21:22:04 -08:00
parent b0f454bf40
commit e3091ac8ed
2 changed files with 42 additions and 38 deletions

View File

@ -1,50 +1,52 @@
version: '2' version: '2'
volumes:
db:
driver: rancher-nfs
services: services:
guacamole: database:
image: glyptodon/guacamole image: mariadb
environment: environment:
MYSQL_HOSTNAME: database MYSQL_DATABASE: guacamole_db
MYSQL_DATABASE: ${guacamole_db} MYSQL_ONETIME_PASSWORD: 'true'
MYSQL_PASSWORD: ${guacamole_password} MYSQL_PASSWORD: guacamole_password
MYSQL_USER: ${guacamole_user} MYSQL_RANDOM_ROOT_PASSWORD: 'true'
command: MYSQL_USER: guacamole_user
- /bin/bash volumes_from:
- -c - db-data
- "cd /usr/local/tomcat/webapps;rm -rf ROOT/; ln -s guacamole.war ROOT.war; /opt/guacamole/bin/start.sh;" labels:
ports: io.rancher.sidekicks: setup-get-db-script,db-data
- ${public_port}:8080
links:
- guacd:guacd
depends_on:
- database
guacd:
image: glyptodon/guacd
setup-get-db-script: setup-get-db-script:
image: glyptodon/guacamole image: glyptodon/guacamole
volumes: network_mode: none
- /docker-entrypoint-initdb.d volumes_from:
- db-data
command: command:
- bash - bash
- -c - -c
- /opt/guacamole/bin/initdb.sh --mysql > /docker-entrypoint-initdb.d/initdb.sql - /opt/guacamole/bin/initdb.sh --mysql > /docker-entrypoint-initdb.d/initdb.sql
labels: labels:
io.rancher.container.start_once: 'true' io.rancher.container.start_once: 'true'
database: db-data:
image: mariadb image: mariadb
environment: network_mode: none
MYSQL_DATABASE: ${guacamole_db}
MYSQL_ONETIME_PASSWORD: 'true'
MYSQL_PASSWORD: ${guacamole_password}
MYSQL_RANDOM_ROOT_PASSWORD: 'true'
MYSQL_USER: ${guacamole_user}
labels:
io.rancher.sidekicks: setup-get-db-script
depends_on:
- setup-get-db-script
volumes_from:
- setup-get-db-script
volumes: volumes:
- db:/var/lib/mysql - /var/lib/mysql
- /docker-entrypoint-initdb.d
command:
- /bin/echo
labels:
io.rancher.container.start_once: 'true'
guacd:
image: glyptodon/guacd
guacamole:
image: glyptodon/guacamole
environment:
MYSQL_DATABASE: guacamole_db
MYSQL_HOSTNAME: database
MYSQL_PASSWORD: guacamole_password
MYSQL_USER: guacamole_user
links:
- guacd:guacd
ports:
- 8080:8080/tcp
command:
- /bin/bash
- -c
- cd /usr/local/tomcat/webapps;rm -rf ROOT/; ln -s guacamole.war ROOT.war; /opt/guacamole/bin/start.sh;

View File

@ -25,7 +25,9 @@ services:
reinitializing_timeout: 60000 reinitializing_timeout: 60000
setup-get-db-script: setup-get-db-script:
scale: 1 scale: 1
mysql: db-data:
scale: 1
database:
scale: 1 scale: 1
health_check: health_check:
healthy_threshold: 2 healthy_threshold: 2