From d96f56a838671424580766beccbe63ad677e4ab8 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Wed, 22 Nov 2017 13:07:43 -0700 Subject: added docker baseimage Issue: IS-34 --- salt/openbook/admin_web_ui/files/Dockerfile | 4 ++-- salt/openbook/admin_web_ui/files/installdeps.sh | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'salt/openbook/admin_web_ui') diff --git a/salt/openbook/admin_web_ui/files/Dockerfile b/salt/openbook/admin_web_ui/files/Dockerfile index 77f4a17..5bd87ad 100644 --- a/salt/openbook/admin_web_ui/files/Dockerfile +++ b/salt/openbook/admin_web_ui/files/Dockerfile @@ -1,5 +1,5 @@ -FROM ubuntu:xenial -MAINTAINER Carlos Konstanski +FROM {{ pillar["registry"]["url"] }}/openbook_baseimage:latest +MAINTAINER Carlos Konstanski ADD docker-start.tar.xz / EXPOSE 8082 5701 5702 VOLUME {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} diff --git a/salt/openbook/admin_web_ui/files/installdeps.sh b/salt/openbook/admin_web_ui/files/installdeps.sh index d52a202..8c7305c 100644 --- a/salt/openbook/admin_web_ui/files/installdeps.sh +++ b/salt/openbook/admin_web_ui/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"] }}' \ -- cgit v1.3