diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-11-22 13:07:43 -0700 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-11-22 13:07:43 -0700 |
| commit | d96f56a838671424580766beccbe63ad677e4ab8 (patch) | |
| tree | db6877f763b7aa72f12ec681578e9d53ee088b3b /salt/openbook/workflow_server/files | |
| parent | 1d12614280fe82454053e2bf381023dcb0c6612c (diff) | |
added docker baseimage
Issue: IS-34
Diffstat (limited to 'salt/openbook/workflow_server/files')
| -rw-r--r-- | salt/openbook/workflow_server/files/Dockerfile | 4 | ||||
| -rw-r--r-- | salt/openbook/workflow_server/files/installdeps.sh | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/salt/openbook/workflow_server/files/Dockerfile b/salt/openbook/workflow_server/files/Dockerfile index ae18ced..6008269 100644 --- a/salt/openbook/workflow_server/files/Dockerfile +++ b/salt/openbook/workflow_server/files/Dockerfile @@ -1,5 +1,5 @@ -FROM ubuntu:xenial -MAINTAINER Carlos Konstanski <carlos@talligent.com> +FROM {{ pillar["registry"]["url"] }}/openbook_baseimage:latest +MAINTAINER Carlos Konstanski <carlos.konstanski@verizonwireless.com> ADD docker-start.tar.xz / EXPOSE 5701 5702 VOLUME {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }} diff --git a/salt/openbook/workflow_server/files/installdeps.sh b/salt/openbook/workflow_server/files/installdeps.sh index a90c3c9..507c2d3 100644 --- a/salt/openbook/workflow_server/files/installdeps.sh +++ b/salt/openbook/workflow_server/files/installdeps.sh @@ -1,10 +1,5 @@ #!/bin/bash -export DEBIAN_FRONTEND=noninteractive -apt-get update -apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade -apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" curl python openjdk-8-jre-headless - current_jar=($(curl -s \ -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ |