From 08e20650b65fd36a40e4daf36aa05f8e68801c27 Mon Sep 17 00:00:00 2001 From: ckonstanski Date: Tue, 21 Nov 2017 14:39:00 -0700 Subject: added baseimage --- salt/openbook/baseimage/files/Dockerfile | 1 + salt/openbook/baseimage/files/build.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/salt/openbook/baseimage/files/Dockerfile b/salt/openbook/baseimage/files/Dockerfile index 0ead57e..a1cc8b9 100644 --- a/salt/openbook/baseimage/files/Dockerfile +++ b/salt/openbook/baseimage/files/Dockerfile @@ -1,3 +1,4 @@ FROM ubuntu:xenial MAINTAINER Carlos Konstanski +ADD docker-start.tar.xz / RUN /installdeps.sh diff --git a/salt/openbook/baseimage/files/build.sh b/salt/openbook/baseimage/files/build.sh index b33611c..a1c5316 100644 --- a/salt/openbook/baseimage/files/build.sh +++ b/salt/openbook/baseimage/files/build.sh @@ -4,6 +4,17 @@ pushd {{ pillar["baseimage"]["build_dir"] }} 2>/dev/null +echo "Creating tmp directory" +rm -rf tmp +mkdir tmp +rm -f docker-start.tar.xz + +echo "Populating with custom files" +rsync -aq data/ tmp/ + +echo "Repackaging into .xz file" +tar Jcvf docker-start.tar.xz -C tmp/ . + echo "Deleting existing docker container" docker stop {{ pillar["baseimage"]["container_name"] }} docker container prune -f @@ -16,5 +27,9 @@ echo "Push docker image to the registry" docker tag {{ pillar["baseimage"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["baseimage"]["image_name"] }} docker push {{ pillar["registry"]["url"] }}/{{ pillar["baseimage"]["image_name"] }} +echo "Cleaning up" +rm -rf tmp +rm -f docker-start.tar.xz + popd 2>/dev/null exit 0 -- cgit v1.3