Choose the correct docker containers to pull at runtime

Issue: IS-80

1 files changed, 16 insertions, 1 deletions

diff --git a/salt/openbook/job_scheduler_server/files/run.sh b/salt/openbook/job_scheduler_server/files/run.sh
index 84387bd..f0bc52d 100644
--- a/salt/openbook/job_scheduler_server/files/run.sh
+++ b/salt/openbook/job_scheduler_server/files/run.sh
@@ -1,4 +1,19 @@
 #!/bin/bash
 
-docker run -d --rm --net=host -p 5000:5000 -p 5701:5701 -p 5702:5702 -p 5703:5703 -p 5704:5704 -p 5705:5705 -p 5706:5706 -v {{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }} -v {{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }} --name {{ pillar["job_scheduler_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }} ${@}
+docker run \
+       -d \
+       --rm \
+       --net=host \
+       -p 5000:5000 \
+       -p 5701:5701 \
+       -p 5702:5702 \
+       -p 5703:5703 \
+       -p 5704:5704 \
+       -p 5705:5705 \
+       -p 5706:5706 \
+       -v {{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }} \
+       -v {{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }} \
+       --name {{ pillar["job_scheduler_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \
+       {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \
+       ${@}
 exit 0