From 074c155f4636849a0e0491b8540fc48e502bf416 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Mon, 9 Oct 2017 10:05:36 -0600 Subject: build only one docker container, not all of them --- salt/openbook/workflow_server/files/Dockerfile | 2 +- salt/openbook/workflow_server/files/installdeps.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'salt/openbook/workflow_server') diff --git a/salt/openbook/workflow_server/files/Dockerfile b/salt/openbook/workflow_server/files/Dockerfile index 682f176..ae18ced 100644 --- a/salt/openbook/workflow_server/files/Dockerfile +++ b/salt/openbook/workflow_server/files/Dockerfile @@ -1,4 +1,4 @@ -FROM {{ pillar["baseimage"]["image_name"] }} +FROM ubuntu:xenial MAINTAINER Carlos Konstanski ADD docker-start.tar.xz / EXPOSE 5701 5702 diff --git a/salt/openbook/workflow_server/files/installdeps.sh b/salt/openbook/workflow_server/files/installdeps.sh index ccb638a..adb184f 100644 --- a/salt/openbook/workflow_server/files/installdeps.sh +++ b/salt/openbook/workflow_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"] }}' \ -- cgit v1.3