From 82a4e72b03b61fcde7244ba199d834cea9849138 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Sat, 10 Mar 2018 12:53:30 -0700 Subject: Choose the correct docker containers to pull at runtime Issue: IS-80 --- salt/openbook/database/files/run.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'salt/openbook/database/files') diff --git a/salt/openbook/database/files/run.sh b/salt/openbook/database/files/run.sh index 10d59f6..923b59a 100644 --- a/salt/openbook/database/files/run.sh +++ b/salt/openbook/database/files/run.sh @@ -18,6 +18,21 @@ else mysql_args="--wsrep-new-cluster" fi -docker run -d --rm --net=host -p 3306:3306 -p 4444:4444 -p 4567:4567 -p 4567:4567/udp -p 4568:4568 -p 9200:9200 -v {{ pillar["database"]["dirs"]["etc_openbook_database"]["name"] }}:/etc/mysql -v {{ pillar["database"]["dirs"]["var_lib_mysql"]["name"] }}:/var/lib/mysql -v {{ pillar["database"]["dirs"]["var_log_mysql"]["name"] }}:/var/log/mysql --name {{ pillar["database"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["database"]["image_name"] }} ${mysql_args} +docker run \ + -d \ + --rm \ + --net=host \ + -p 3306:3306 \ + -p 4444:4444 \ + -p 4567:4567 \ + -p 4567:4567/udp \ + -p 4568:4568 \ + -p 9200:9200 \ + -v {{ pillar["database"]["dirs"]["etc_openbook_database"]["name"] }}:/etc/mysql \ + -v {{ pillar["database"]["dirs"]["var_lib_mysql"]["name"] }}:/var/lib/mysql \ + -v {{ pillar["database"]["dirs"]["var_log_mysql"]["name"] }}:/var/log/mysql \ + --name {{ pillar["database"]["container_name"] }} \ + {{ pillar["registry"]["url"] }}/{{ pillar["database"]["image_name"] }} \ + ${mysql_args} exit 0 -- cgit v1.3