diff options
Diffstat (limited to 'salt/openbook')
28 files changed, 201 insertions, 91 deletions
diff --git a/salt/openbook/admin_api_server/files/build.sh b/salt/openbook/admin_api_server/files/build.sh index feaaaa1..b42f423 100644 --- a/salt/openbook/admin_api_server/files/build.sh +++ b/salt/openbook/admin_api_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["admin_api_server"]["container_name"] }} +docker stop {{ pillar["admin_api_server"]["container_name"] }}_{{ pillar["admin_api_server"]["branch"] }} docker container prune -f -docker rmi -f {{ pillar["admin_api_server"]["image_name"] }} +docker rmi -f {{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }} echo "Building docker Ubuntu image" -docker build -t {{ pillar["admin_api_server"]["image_name"] }} . +docker build -t {{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }} . echo "Push docker image to the registry" -docker tag {{ pillar["admin_api_server"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} -docker push {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} +docker tag {{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }} +docker push {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }} echo "Cleaning up" rm -rf tmp diff --git a/salt/openbook/admin_api_server/files/installdeps.sh b/salt/openbook/admin_api_server/files/installdeps.sh index 5a1398f..ad53b3e 100644 --- a/salt/openbook/admin_api_server/files/installdeps.sh +++ b/salt/openbook/admin_api_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["admin_api_server"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + | grep -o -P '{{ pillar["admin_api_server"]["jar_name"] }}-{{ pillar["admin_api_server"]["branch"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ diff --git a/salt/openbook/admin_api_server/files/run.sh b/salt/openbook/admin_api_server/files/run.sh index ff12be2..e788bfd 100644 --- a/salt/openbook/admin_api_server/files/run.sh +++ b/salt/openbook/admin_api_server/files/run.sh @@ -1,4 +1,22 @@ #!/bin/bash -docker run -d --rm --net=host -p 5002:5002 -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:8083 -p 5701:5701 -p 5702:5702 -p 5703:5703 -p 5704:5704 -p 5705:5705 -p 5706:5706 -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} ${@} +docker run \ + -d \ + --rm \ + --net=host \ + -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:{% raw %}{{ openbook_admin_api_server_port }}{% endraw %} \ + -p 5002:5002 \ + -p 5701:5701 \ + -p 5702:5702 \ + -p 5703:5703 \ + -p 5704:5704 \ + -p 5705:5705 \ + -p 5706:5706 \ + -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} \ + -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} \ + -v /etc/ssl/certs:/etc/ssl/certs \ + -v /etc/ssl/private:/etc/ssl/private \ + --name {{ pillar["admin_api_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \ + {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \ + ${@} exit 0 diff --git a/salt/openbook/admin_api_server/files/start_app.sh b/salt/openbook/admin_api_server/files/start_app.sh index e8259d5..7709b23 100644 --- a/salt/openbook/admin_api_server/files/start_app.sh +++ b/salt/openbook/admin_api_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=5002" -else - args="" + args="${args} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5002" fi -jar=$(find -maxdepth 1 -type f -name '{{ pillar["admin_api_server"]["jar_name"] }}*' | awk -F/ '{print $2}') +jar=$(find -maxdepth 1 -type f -name '{{ pillar["admin_api_server"]["jar_name"] }}-{{ pillar["admin_api_server"]["branch"] }}*' | awk -F/ '{print $2}') exec java ${args} -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster diff --git a/salt/openbook/admin_web_ui/files/build.sh b/salt/openbook/admin_web_ui/files/build.sh index 0964047..a7bc7c3 100644 --- a/salt/openbook/admin_web_ui/files/build.sh +++ b/salt/openbook/admin_web_ui/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["admin_web_ui"]["container_name"] }} +docker stop {{ pillar["admin_web_ui"]["container_name"] }}_{{ pillar["admin_web_ui"]["branch"] }} docker container prune -f -docker rmi -f {{ pillar["admin_web_ui"]["image_name"] }} +docker rmi -f {{ pillar["admin_web_ui"]["image_name"] }}_{{ pillar["admin_web_ui"]["branch"] }} echo "Building docker Ubuntu image" -docker build -t {{ pillar["admin_web_ui"]["image_name"] }} . +docker build -t {{ pillar["admin_web_ui"]["image_name"] }}_{{ pillar["admin_web_ui"]["branch"] }} . echo "Push docker image to the registry" -docker tag {{ pillar["admin_web_ui"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} -docker push {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} +docker tag {{ pillar["admin_web_ui"]["image_name"] }}_{{ pillar["admin_web_ui"]["branch"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }}_{{ pillar["admin_web_ui"]["branch"] }} +docker push {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }}_{{ pillar["admin_web_ui"]["branch"] }} echo "Cleaning up" rm -rf tmp diff --git a/salt/openbook/admin_web_ui/files/installdeps.sh b/salt/openbook/admin_web_ui/files/installdeps.sh index 8c7305c..0d73fc2 100644 --- a/salt/openbook/admin_web_ui/files/installdeps.sh +++ b/salt/openbook/admin_web_ui/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["admin_web_ui"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + | grep -o -P '{{ pillar["admin_web_ui"]["jar_name"] }}-{{ pillar["admin_web_ui"]["branch"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ diff --git a/salt/openbook/admin_web_ui/files/run.sh b/salt/openbook/admin_web_ui/files/run.sh index ec7bfba..b5e8c27 100644 --- a/salt/openbook/admin_web_ui/files/run.sh +++ b/salt/openbook/admin_web_ui/files/run.sh @@ -1,4 +1,21 @@ #!/bin/bash -docker run -d --rm --net=host -p 5004:5004 -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:8082 -p 5701:5701 -p 5702:5702 -p 5703:5703 -p 5704:5704 -p 5705:5705 -p 5706:5706 -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} ${@} +docker run \ + -d \ + --rm \ + --net=host \ + -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:{% raw %}{{ openbook_admin_web_ui_port }}{% endraw %} \ + -p 5004:5004 \ + -p 5701:5701 \ + -p 5702:5702 \ + -p 5703:5703 \ + -p 5704:5704 \ + -p 5705:5705 \ + -p 5706:5706 \ + -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} \ + -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} \ + -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private \ + --name {{ pillar["admin_web_ui"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \ + {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \ + ${@} exit 0 diff --git a/salt/openbook/admin_web_ui/files/start_app.sh b/salt/openbook/admin_web_ui/files/start_app.sh index 9c4e929..2f445c8 100644 --- a/salt/openbook/admin_web_ui/files/start_app.sh +++ b/salt/openbook/admin_web_ui/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=5004" -else - args="" + args="${args} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5004" fi -jar=$(find -maxdepth 1 -type f -name '{{ pillar["admin_web_ui"]["jar_name"] }}*' | awk -F/ '{print $2}') +jar=$(find -maxdepth 1 -type f -name '{{ pillar["admin_web_ui"]["jar_name"] }}-{{ pillar["admin_web_ui"]["branch"] }}*' | awk -F/ '{print $2}') exec java ${args} -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster diff --git a/salt/openbook/ansible/files/openbook.yaml b/salt/openbook/ansible/files/openbook.yaml index 2990dd8..ce56561 100644 --- a/salt/openbook/ansible/files/openbook.yaml +++ b/salt/openbook/ansible/files/openbook.yaml @@ -203,22 +203,22 @@ docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["database"]["image_name"] }}" fi if [ "{% raw %}{{ openbook_install_job_scheduler_server|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["job_scheduler_server"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["job_scheduler_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi if [ "{% raw %}{{ openbook_install_workflow_server|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["workflow_server"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["workflow_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi if [ "{% raw %}{{ openbook_install_admin_api_server|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["admin_api_server"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["admin_api_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi if [ "{% raw %}{{ openbook_install_customer_api_server|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["customer_api_server"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["customer_api_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi if [ "{% raw %}{{ openbook_install_admin_web_ui|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["admin_web_ui"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["admin_web_ui"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi if [ "{% raw %}{{ openbook_install_customer_web_ui|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["customer_web_ui"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["customer_web_ui"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi args: executable: /bin/bash diff --git a/salt/openbook/ci/files/build.sh b/salt/openbook/ci/files/build.sh index 649a1af..73b9a4b 100644 --- a/salt/openbook/ci/files/build.sh +++ b/salt/openbook/ci/files/build.sh @@ -25,32 +25,32 @@ elif [ "${artifact}" == "database" ]; then delete_old_image "{{ pillar["database"]["image_name"] }}" {{ pillar["database"]["build_dir"] }}/build.sh elif [ "${artifact}" == "admin-api-server" ]; then - delete_old_image "{{ pillar["admin_api_server"]["image_name"] }}" + delete_old_image "{{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }}" {{ pillar["admin_api_server"]["build_dir"] }}/build.sh elif [ "${artifact}" == "customer-api-server" ]; then - delete_old_image "{{ pillar["customer_api_server"]["image_name"] }}" + delete_old_image "{{ pillar["customer_api_server"]["image_name"] }}_{{ pillar["customer_api_server"]["branch"] }}" {{ pillar["customer_api_server"]["build_dir"] }}/build.sh elif [ "${artifact}" == "admin-web-ui" ]; then - delete_old_image "{{ pillar["admin_web_ui"]["image_name"] }}" + delete_old_image "{{ pillar["admin_web_ui"]["image_name"] }}_{{ pillar["admin_web_ui"]["branch"] }}" {{ pillar["admin_web_ui"]["build_dir"] }}/build.sh elif [ "${artifact}" == "customer-web-ui" ]; then - delete_old_image "{{ pillar["customer_web_ui"]["image_name"] }}" + delete_old_image "{{ pillar["customer_web_ui"]["image_name"] }}_{{ pillar["customer_web_ui"]["branch"] }}" {{ pillar["customer_web_ui"]["build_dir"] }}/build.sh elif [ "${artifact}" == "job-scheduler-server" ]; then - delete_old_image "{{ pillar["job_scheduler_server"]["image_name"] }}" + delete_old_image "{{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }}" {{ pillar["job_scheduler_server"]["build_dir"] }}/build.sh elif [ "${artifact}" == "workflow-server" ]; then - delete_old_image "{{ pillar["workflow_server"]["image_name"] }}" + delete_old_image "{{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }}" {{ pillar["workflow_server"]["build_dir"] }}/build.sh else delete_old_image "{{ pillar["baseimage"]["image_name"] }}" delete_old_image "{{ pillar["database"]["image_name"] }}" - delete_old_image "{{ pillar["admin_api_server"]["image_name"] }}" - delete_old_image "{{ pillar["customer_api_server"]["image_name"] }}" - delete_old_image "{{ pillar["admin_web_ui"]["image_name"] }}" - delete_old_image "{{ pillar["customer_web_ui"]["image_name"] }}" - delete_old_image "{{ pillar["job_scheduler_server"]["image_name"] }}" - delete_old_image "{{ pillar["workflow_server"]["image_name"] }}" + delete_old_image "{{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }}" + delete_old_image "{{ pillar["customer_api_server"]["image_name"] }}_{{ pillar["customer_api_server"]["branch"] }}" + delete_old_image "{{ pillar["admin_web_ui"]["image_name"] }}_{{ pillar["admin_web_ui"]["branch"] }}" + delete_old_image "{{ pillar["customer_web_ui"]["image_name"] }}_{{ pillar["customer_web_ui"]["branch"] }}" + delete_old_image "{{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }}" + delete_old_image "{{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }}" {{ pillar["baseimage"]["build_dir"] }}/build.sh {{ pillar["database"]["build_dir"] }}/build.sh {{ pillar["admin_api_server"]["build_dir"] }}/build.sh diff --git a/salt/openbook/ci/files/openbookctl b/salt/openbook/ci/files/openbookctl index a316bb5..24c87bc 100644 --- a/salt/openbook/ci/files/openbookctl +++ b/salt/openbook/ci/files/openbookctl @@ -61,22 +61,22 @@ do_start() { do_stop() { {% raw %}{% if "True" == openbook_install_customer_web_ui|string() %}{% endraw %} - docker stop {{ pillar["customer_web_ui"]["container_name"] }} + docker stop {{ pillar["customer_web_ui"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_admin_web_ui|string() %}{% endraw %} - docker stop {{ pillar["admin_web_ui"]["container_name"] }} + docker stop {{ pillar["admin_web_ui"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_customer_api_server|string() %}{% endraw %} - docker stop {{ pillar["customer_api_server"]["container_name"] }} + docker stop {{ pillar["customer_api_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_admin_api_server|string() %}{% endraw %} - docker stop {{ pillar["admin_api_server"]["container_name"] }} + docker stop {{ pillar["admin_api_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_workflow_server|string() %}{% endraw %} - docker stop {{ pillar["workflow_server"]["container_name"] }} + docker stop {{ pillar["workflow_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_job_scheduler_server|string() %}{% endraw %} - docker stop {{ pillar["job_scheduler_server"]["container_name"] }} + docker stop {{ pillar["job_scheduler_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} {% raw %}{% endif %}{% endraw %} {% raw %}{% if "True" == openbook_install_database|string() %}{% endraw %} docker stop {{ pillar["database"]["container_name"] }} diff --git a/salt/openbook/customer_api_server/files/build.sh b/salt/openbook/customer_api_server/files/build.sh index 513ca2d..a4ef630 100644 --- a/salt/openbook/customer_api_server/files/build.sh +++ b/salt/openbook/customer_api_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["customer_api_server"]["container_name"] }} +docker stop {{ pillar["customer_api_server"]["container_name"] }}_{{ pillar["customer_api_server"]["branch"] }} docker container prune -f -docker rmi -f {{ pillar["customer_api_server"]["image_name"] }} +docker rmi -f {{ pillar["customer_api_server"]["image_name"] }}_{{ pillar["customer_api_server"]["branch"] }} echo "Building docker Ubuntu image" -docker build -t {{ pillar["customer_api_server"]["image_name"] }} . +docker build -t {{ pillar["customer_api_server"]["image_name"] }}_{{ pillar["customer_api_server"]["branch"] }} . echo "Push docker image to the registry" -docker tag {{ pillar["customer_api_server"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} -docker push {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} +docker tag {{ pillar["customer_api_server"]["image_name"] }}_{{ pillar["customer_api_server"]["branch"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }}_{{ pillar["customer_api_server"]["branch"] }} +docker push {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }}_{{ pillar["customer_api_server"]["branch"] }} echo "Cleaning up" rm -rf tmp diff --git a/salt/openbook/customer_api_server/files/installdeps.sh b/salt/openbook/customer_api_server/files/installdeps.sh index 8ced89e..7c36cf2 100644 --- a/salt/openbook/customer_api_server/files/installdeps.sh +++ b/salt/openbook/customer_api_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["customer_api_server"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + | grep -o -P '{{ pillar["customer_api_server"]["jar_name"] }}-{{ pillar["customer_api_server"]["branch"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ diff --git a/salt/openbook/customer_api_server/files/run.sh b/salt/openbook/customer_api_server/files/run.sh index 797e2a4..a134b4c 100644 --- a/salt/openbook/customer_api_server/files/run.sh +++ b/salt/openbook/customer_api_server/files/run.sh @@ -1,4 +1,22 @@ #!/bin/bash -docker run -d --rm --net=host -p 5003:5003 -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:8081 -p 5701:5701 -p 5702:5702 -p 5703:5703 -p 5704:5704 -p 5705:5705 -p 5706:5706 -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} ${@} +docker run \ + -d \ + --rm \ + --net=host \ + -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:{% raw %}{{ openbook_customer_api_server_port }}{% endraw %} \ + -p 5003:5003 \ + -p 5701:5701 \ + -p 5702:5702 \ + -p 5703:5703 \ + -p 5704:5704 \ + -p 5705:5705 \ + -p 5706:5706 \ + -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} \ + -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} \ + -v /etc/ssl/certs:/etc/ssl/certs \ + -v /etc/ssl/private:/etc/ssl/private \ + --name {{ pillar["customer_api_server"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \ + {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \ + ${@} exit 0 diff --git a/salt/openbook/customer_api_server/files/start_app.sh b/salt/openbook/customer_api_server/files/start_app.sh index 277e561..96fda02 100644 --- a/salt/openbook/customer_api_server/files/start_app.sh +++ b/salt/openbook/customer_api_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=5003" -else - args="" + args="${args} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5003" fi -jar=$(find -maxdepth 1 -type f -name '{{ pillar["customer_api_server"]["jar_name"] }}*' | awk -F/ '{print $2}') +jar=$(find -maxdepth 1 -type f -name '{{ pillar["customer_api_server"]["jar_name"] }}-{{ pillar["customer_api_server"]["branch"] }}*' | awk -F/ '{print $2}') exec java ${args} -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster diff --git a/salt/openbook/customer_web_ui/files/build.sh b/salt/openbook/customer_web_ui/files/build.sh index 6119a0c..55ad883 100644 --- a/salt/openbook/customer_web_ui/files/build.sh +++ b/salt/openbook/customer_web_ui/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["customer_web_ui"]["container_name"] }} +docker stop {{ pillar["customer_web_ui"]["container_name"] }}_{{ pillar["customer_web_ui"]["branch"] }} docker container prune -f -docker rmi -f {{ pillar["customer_web_ui"]["image_name"] }} +docker rmi -f {{ pillar["customer_web_ui"]["image_name"] }}_{{ pillar["customer_web_ui"]["branch"] }} echo "Building docker Ubuntu image" -docker build -t {{ pillar["customer_web_ui"]["image_name"] }} . +docker build -t {{ pillar["customer_web_ui"]["image_name"] }}_{{ pillar["customer_web_ui"]["branch"] }} . echo "Push docker image to the registry" -docker tag {{ pillar["customer_web_ui"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} -docker push {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} +docker tag {{ pillar["customer_web_ui"]["image_name"] }}_{{ pillar["customer_web_ui"]["branch"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }}_{{ pillar["customer_web_ui"]["branch"] }} +docker push {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }}_{{ pillar["customer_web_ui"]["branch"] }} echo "Cleaning up" rm -rf tmp diff --git a/salt/openbook/customer_web_ui/files/installdeps.sh b/salt/openbook/customer_web_ui/files/installdeps.sh index 79027be..56e1b8e 100644 --- a/salt/openbook/customer_web_ui/files/installdeps.sh +++ b/salt/openbook/customer_web_ui/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["customer_web_ui"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + | grep -o -P '{{ pillar["customer_web_ui"]["jar_name"] }}-{{ pillar["customer_web_ui"]["branch"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ diff --git a/salt/openbook/customer_web_ui/files/run.sh b/salt/openbook/customer_web_ui/files/run.sh index 60e9be7..7e46150 100644 --- a/salt/openbook/customer_web_ui/files/run.sh +++ b/salt/openbook/customer_web_ui/files/run.sh @@ -1,4 +1,22 @@ #!/bin/bash -docker run -d --rm --net=host -p 5005:5005 -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:8080 -p 5701:5701 -p 5702:5702 -p 5703:5703 -p 5704:5704 -p 5705:5705 -p 5706:5706 -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} ${@} +docker run \ + -d \ + --rm \ + --net=host \ + -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:{% raw %}{{ openbook_customer_web_ui_port }}{% endraw %} \ + -p 5005:5005 \ + -p 5701:5701 \ + -p 5702:5702 \ + -p 5703:5703 \ + -p 5704:5704 \ + -p 5705:5705 \ + -p 5706:5706 \ + -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} \ + -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} \ + -v /etc/ssl/certs:/etc/ssl/certs \ + -v /etc/ssl/private:/etc/ssl/private \ + --name {{ pillar["customer_web_ui"]["container_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \ + {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %} \ + ${@} exit 0 diff --git a/salt/openbook/customer_web_ui/files/start_app.sh b/salt/openbook/customer_web_ui/files/start_app.sh index d8a4d73..45f8d43 100644 --- a/salt/openbook/customer_web_ui/files/start_app.sh +++ b/salt/openbook/customer_web_ui/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=5005" -else - args="" + args="${args} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" fi -jar=$(find -maxdepth 1 -type f -name '{{ pillar["customer_web_ui"]["jar_name"] }}*' | awk -F/ '{print $2}') +jar=$(find -maxdepth 1 -type f -name '{{ pillar["customer_web_ui"]["jar_name"] }}-{{ pillar["customer_web_ui"]["branch"] }}*' | awk -F/ '{print $2}') exec java ${args} -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster 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 diff --git a/salt/openbook/job_scheduler_server/files/build.sh b/salt/openbook/job_scheduler_server/files/build.sh index 84b5759..866adae 100644 --- a/salt/openbook/job_scheduler_server/files/build.sh +++ b/salt/openbook/job_scheduler_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["job_scheduler_server"]["container_name"] }} +docker stop {{ pillar["job_scheduler_server"]["container_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} docker container prune -f -docker rmi -f {{ pillar["job_scheduler_server"]["image_name"] }} +docker rmi -f {{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} echo "Building docker Ubuntu image" -docker build -t {{ pillar["job_scheduler_server"]["image_name"] }} . +docker build -t {{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} . echo "Push docker image to the registry" -docker tag {{ pillar["job_scheduler_server"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }} -docker push {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }} +docker tag {{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} +docker push {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} echo "Cleaning up" rm -rf tmp diff --git a/salt/openbook/job_scheduler_server/files/installdeps.sh b/salt/openbook/job_scheduler_server/files/installdeps.sh index e9a7173..d5a8f22 100644 --- a/salt/openbook/job_scheduler_server/files/installdeps.sh +++ b/salt/openbook/job_scheduler_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["job_scheduler_server"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + | grep -o -P '{{ pillar["job_scheduler_server"]["jar_name"] }}-{{ pillar["job_scheduler_server"]["branch"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ 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 diff --git a/salt/openbook/job_scheduler_server/files/start_app.sh b/salt/openbook/job_scheduler_server/files/start_app.sh index 0271fba..65b2fe0 100644 --- a/salt/openbook/job_scheduler_server/files/start_app.sh +++ b/salt/openbook/job_scheduler_server/files/start_app.sh @@ -1,10 +1,9 @@ #!/bin/bash +args="-Djava.awt.headless=true -Xmx1024m -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=5000" -else - args="" + args="${args} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5000" fi -jar=$(find -maxdepth 1 -type f -name '{{ pillar["job_scheduler_server"]["jar_name"] }}*' | awk -F/ '{print $2}') +jar=$(find -maxdepth 1 -type f -name '{{ pillar["job_scheduler_server"]["jar_name"] }}-{{ pillar["job_scheduler_server"]["branch"] }}*' | awk -F/ '{print $2}') exec java ${args} -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster 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 |