From a07600705390f7742b44a7483edcbbab89197b00 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 6 Sep 2017 18:48:41 +0200 Subject: Fix docker-build. --- Makefile | 2 +- catlfish-build/Dockerfile | 4 +++- catlfish-build/start.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 47d7d96..195ef82 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ dist: - docker run -v /tar-files:. -e COPYTO=/tar-files catlfish-build + docker run -it --rm -v $(PWD):/dist catlfish-build catlfish-build: docker build --no-cache --rm -t $@:latest $@ diff --git a/catlfish-build/Dockerfile b/catlfish-build/Dockerfile index 451aa0d..9b5ebdd 100644 --- a/catlfish-build/Dockerfile +++ b/catlfish-build/Dockerfile @@ -1,5 +1,7 @@ FROM catlfish-dev - +USER root +RUN apt-get -yq install xz-utils ADD start.sh / +VOLUME /dist WORKDIR /usr/local/src/catlfish ENTRYPOINT ["/start.sh"] diff --git a/catlfish-build/start.sh b/catlfish-build/start.sh index 65b3f7a..097773b 100644 --- a/catlfish-build/start.sh +++ b/catlfish-build/start.sh @@ -4,4 +4,4 @@ set -o errexit set -o nounset make dist -[ -n "${COPYTO}" ] && cp catlfish-*.tar.* ${COPYTO}/ +cp catlfish-*.tar.* /dist/ -- cgit v1.1