diff options
Diffstat (limited to 'salt/openbook/admin_web_ui/files')
| -rw-r--r-- | salt/openbook/admin_web_ui/files/Dockerfile | 2 | ||||
| -rw-r--r-- | salt/openbook/admin_web_ui/files/installdeps.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/salt/openbook/admin_web_ui/files/Dockerfile b/salt/openbook/admin_web_ui/files/Dockerfile index 4b57ce5..77f4a17 100644 --- a/salt/openbook/admin_web_ui/files/Dockerfile +++ b/salt/openbook/admin_web_ui/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 8082 5701 5702 diff --git a/salt/openbook/admin_web_ui/files/installdeps.sh b/salt/openbook/admin_web_ui/files/installdeps.sh index 7de3c7c..9485ce1 100644 --- a/salt/openbook/admin_web_ui/files/installdeps.sh +++ b/salt/openbook/admin_web_ui/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"] }}' \ |