summaryrefslogtreecommitdiff
path: root/salt/openbook/customer_api_server
diff options
context:
space:
mode:
Diffstat (limited to 'salt/openbook/customer_api_server')
-rw-r--r--salt/openbook/customer_api_server/files/Dockerfile2
-rw-r--r--salt/openbook/customer_api_server/files/installdeps.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/salt/openbook/customer_api_server/files/Dockerfile b/salt/openbook/customer_api_server/files/Dockerfile
index 98303c5..fb4d46f 100644
--- a/salt/openbook/customer_api_server/files/Dockerfile
+++ b/salt/openbook/customer_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 8081 5701 5702
diff --git a/salt/openbook/customer_api_server/files/installdeps.sh b/salt/openbook/customer_api_server/files/installdeps.sh
index e8054cf..e0dc20f 100644
--- a/salt/openbook/customer_api_server/files/installdeps.sh
+++ b/salt/openbook/customer_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"] }}' \