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 <admwiggin@gmail.com>
| ... | ... |
@@ -56,15 +56,11 @@ DEST=$1 |
| 56 | 56 |
RUN { echo '$debSource (${debVersion}-0~${suite}) $suite; urgency=low'; echo; echo ' * Version: $VERSION'; echo; echo " -- $debMaintainer $debDate"; } > debian/changelog && cat >&2 debian/changelog
|
| 57 | 57 |
RUN dpkg-buildpackage -uc -us |
| 58 | 58 |
EOF |
| 59 |
- cp -a "$DEST/$version/Dockerfile.build" . # can't use $DEST because it's in .dockerignore... |
|
| 60 | 59 |
tempImage="docker-temp/build-deb:$version" |
| 61 |
- ( set -x && docker build -t "$tempImage" -f Dockerfile.build . ) |
|
| 60 |
+ ( set -x && docker build -t "$tempImage" -f "$DEST/$version/Dockerfile.build" . ) |
|
| 62 | 61 |
docker run --rm "$tempImage" bash -c 'cd .. && tar -c *_*' | tar -xvC "$DEST/$version" |
| 63 | 62 |
docker rmi "$tempImage" |
| 64 | 63 |
done |
| 65 | 64 |
|
| 66 |
- # clean up after ourselves |
|
| 67 |
- rm -f Dockerfile.build |
|
| 68 |
- |
|
| 69 | 65 |
source "${MAKEDIR}/.integration-daemon-stop"
|
| 70 | 66 |
) 2>&1 | tee -a "$DEST/test.log" |