diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-09 10:05:36 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-09 10:05:36 -0600 |
| commit | 074c155f4636849a0e0491b8540fc48e502bf416 (patch) | |
| tree | 77ba6f4e5f72666a067151013df0f5f03f3870ba /salt/openbook/admin_api_server | |
| parent | aa2e32bbfa949bba9d01f4b92ea8064173a2c1cd (diff) | |
build only one docker container, not all of them
Diffstat (limited to 'salt/openbook/admin_api_server')
| -rw-r--r-- | salt/openbook/admin_api_server/files/Dockerfile | 2 | ||||
| -rw-r--r-- | salt/openbook/admin_api_server/files/installdeps.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/salt/openbook/admin_api_server/files/Dockerfile b/salt/openbook/admin_api_server/files/Dockerfile index ccd1cbf..c72d861 100644 --- a/salt/openbook/admin_api_server/files/Dockerfile +++ b/salt/openbook/admin_api_server/files/Dockerfile @@ -1,4 +1,4 @@ -FROM {{ pillar["baseimage"]["image_name"] }} +FROM ubuntu:xenial MAINTAINER Carlos Konstanski <carlos@talligent.com> ADD docker-start.tar.xz / EXPOSE 8083 5701 5702 diff --git a/salt/openbook/admin_api_server/files/installdeps.sh b/salt/openbook/admin_api_server/files/installdeps.sh index 2d97c9f..e1f2651 100644 --- a/salt/openbook/admin_api_server/files/installdeps.sh +++ b/salt/openbook/admin_api_server/files/installdeps.sh @@ -1,7 +1,9 @@ #!/bin/bash export DEBIAN_FRONTEND=noninteractive -apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" openjdk-8-jre-headless +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 curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ |