diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-09-06 18:48:41 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-09-06 18:48:41 +0200 |
| commit | a07600705390f7742b44a7483edcbbab89197b00 (patch) | |
| tree | 5d2e281f3ba32cc0e2cf60da3ebf1f50615c8a7d | |
| parent | 40bc8c41cc73d58ad975d7bf218fcb698e944094 (diff) | |
Fix docker-build.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | catlfish-build/Dockerfile | 4 | ||||
| -rw-r--r-- | catlfish-build/start.sh | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -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/ |