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/database/files/Dockerfile | 2 +- salt/openbook/database/files/installdeps.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'salt/openbook/database') diff --git a/salt/openbook/database/files/Dockerfile b/salt/openbook/database/files/Dockerfile index d674c68..d07525a 100644 --- a/salt/openbook/database/files/Dockerfile +++ b/salt/openbook/database/files/Dockerfile @@ -1,4 +1,4 @@ -FROM {{ pillar["baseimage"]["image_name"] }} +FROM ubuntu:xenial MAINTAINER Carlos Konstanski ADD docker-start.tar.xz / EXPOSE 3306 4444 4567 4567/udp 4568 9200 diff --git a/salt/openbook/database/files/installdeps.sh b/salt/openbook/database/files/installdeps.sh index d04a4db..d752848 100644 --- a/salt/openbook/database/files/installdeps.sh +++ b/salt/openbook/database/files/installdeps.sh @@ -6,7 +6,7 @@ apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74C add-apt-repository 'deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu xenial main' apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade -apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install netcat mariadb-server-10.1 xinetd +apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install curl python netcat mariadb-server-10.1 xinetd service mysql stop service xinetd stop -- cgit v1.3