Choose the correct docker containers to pull at runtime

Issue: IS-80

4 files changed, 25 insertions, 11 deletions

diff --git a/salt/openbook/workflow_server/files/build.sh b/salt/openbook/workflow_server/files/build.sh
index d89c34e..dbb5238 100644
--- a/salt/openbook/workflow_server/files/build.sh
+++ b/salt/openbook/workflow_server/files/build.sh
@@ -16,16 +16,16 @@ echo "Repackaging into .xz file"
 tar Jcvf docker-start.tar.xz -C tmp/ .
 
 echo "Deleting existing docker container"
-docker stop {{ pillar["workflow_server"]["container_name"] }}
+docker stop {{ pillar["workflow_server"]["container_name"] }}_{{ pillar["workflow_server"]["branch"] }}
 docker container prune -f
-docker rmi -f {{ pillar["workflow_server"]["image_name"] }}
+docker rmi -f {{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }}
 
 echo "Building docker Ubuntu image"
-docker build -t {{ pillar["workflow_server"]["image_name"] }} .
+docker build -t {{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }} .
 
 echo "Push docker image to the registry"
-docker tag {{ pillar["workflow_server"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}
-docker push {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}
+docker tag {{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }}
+docker push {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }}
 
 echo "Cleaning up"
 rm -rf tmp
diff --git a/salt/openbook/workflow_server/files/installdeps.sh b/salt/openbook/workflow_server/files/installdeps.sh
index 507c2d3..b27f04a 100644
--- a/salt/openbook/workflow_server/files/installdeps.sh
+++ b/salt/openbook/workflow_server/files/installdeps.sh
@@ -4,7 +4,7 @@ current_jar=($(curl -s \
      -k \
      -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \
      {{ pillar["jars"]["url"] }} \
-    | grep -o -P '{{ pillar["workflow_server"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar'))
+    | grep -o -P '{{ pillar["workflow_server"]["jar_name"] }}-{{ pillar["workflow_server"]["branch"] }}\.[\d]+\.[\d]+\.[\d]+\.jar'))
 
 curl -k \
      -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \
diff --git a/salt/openbook/workflow_server/files/run.sh b/salt/openbook/workflow_server/files/run.sh
index 5ca5a87..b1d0137 100644
--- a/salt/openbook/workflow_server/files/run.sh
+++ b/salt/openbook/workflow_server/files/run.sh
@@ -1,4 +1,19 @@
 #!/bin/bash
 
-docker run -d --rm --net=host -p 5001:5001 -p 5701:5701 -p 5702:5702 -p 5703:5703 -p 5704:5704 -p 5705:5705 -p 5706:5706 -v {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }} -v {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }} --name {{ pillar["workflow_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }} ${@}
+docker run \
+       -d \
+       --rm \
+       --net=host \
+       -p 5001:5001 \
+       -p 5701:5701 \
+       -p 5702:5702 \
+       -p 5703:5703 \
+       -p 5704:5704 \
+       -p 5705:5705 \
+       -p 5706:5706 \
+       -v {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }} \
+       -v {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }} \
+       --name {{ pillar["workflow_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \
+       {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \
+       ${@}
 exit 0
diff --git a/salt/openbook/workflow_server/files/start_app.sh b/salt/openbook/workflow_server/files/start_app.sh
index 4ba6b98..7dab42e 100644
--- a/salt/openbook/workflow_server/files/start_app.sh
+++ b/salt/openbook/workflow_server/files/start_app.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
+args="-Djava.awt.headless=true -Xmx256m -XX:+UseConcMarkSweepGC -Djsse.enableSNIExtension=false -Djava.security.egd=file:/dev/urandom"
 if [ "${1}" == "debug" ]; then
-    args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5001"
-else
-    args=""
+    args="${args} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5001"
 fi
 
-jar=$(find -maxdepth 1 -type f -name '{{ pillar["workflow_server"]["jar_name"] }}*' | awk -F/ '{print $2}')
+jar=$(find -maxdepth 1 -type f -name '{{ pillar["workflow_server"]["jar_name"] }}-{{ pillar["workflow_server"]["branch"] }}*' | awk -F/ '{print $2}')
 exec java ${args} -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster