From 9f5730e131699caaf6f8f6f941d5942d68295055 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 1 May 2015 14:45:00 -0600 Subject: [PATCH] Remove hacky "cp .../Dockerfile.build ." in "build-deb" Turns out that `-f` on a file that's in `.dockerignore` actually does work. No idea why it wasn't when I was doing this before, but oh well! :metal: Signed-off-by: Andrew "Tianon" Page --- hack/make/build-deb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hack/make/build-deb b/hack/make/build-deb index a5a6d43870..90a2b98b85 100644 --- a/hack/make/build-deb +++ b/hack/make/build-deb @@ -56,15 +56,11 @@ DEST=$1 RUN { echo '$debSource (${debVersion}-0~${suite}) $suite; urgency=low'; echo; echo ' * Version: $VERSION'; echo; echo " -- $debMaintainer $debDate"; } > debian/changelog && cat >&2 debian/changelog RUN dpkg-buildpackage -uc -us EOF - cp -a "$DEST/$version/Dockerfile.build" . # can't use $DEST because it's in .dockerignore... tempImage="docker-temp/build-deb:$version" - ( set -x && docker build -t "$tempImage" -f Dockerfile.build . ) + ( set -x && docker build -t "$tempImage" -f "$DEST/$version/Dockerfile.build" . ) docker run --rm "$tempImage" bash -c 'cd .. && tar -c *_*' | tar -xvC "$DEST/$version" docker rmi "$tempImage" done - # clean up after ourselves - rm -f Dockerfile.build - source "${MAKEDIR}/.integration-daemon-stop" ) 2>&1 | tee -a "$DEST/test.log"