aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Mortier <mort@cantab.net>2019-10-18 17:05:27 +0100
committerRichard Mortier <mort@cantab.net>2019-10-18 17:05:27 +0100
commit8d734662293f8f78822992cc0e5b9e7f3a619370 (patch)
tree80ff0c0d871d2d91d2c98db72e3115c9ba5b8553
parenteed1a4d608fdb061a9f3e9d06bc10dfc3db6d8c9 (diff)
downloaddocker-abuild-8d734662293f8f78822992cc0e5b9e7f3a619370.tar.bz2
docker-abuild-8d734662293f8f78822992cc0e5b9e7f3a619370.tar.xz
dabuild: unabstractify `docker` invocation
Signed-off-by: Richard Mortier <mort@cantab.net>
-rwxr-xr-xdabuild.in11
1 files changed, 7 insertions, 4 deletions
diff --git a/dabuild.in b/dabuild.in
index 9c83102..dd0f154 100755
--- a/dabuild.in
+++ b/dabuild.in
@@ -87,7 +87,10 @@ if [ "$DABUILD_CACHE" = "true" ]; then
fi
## go!
-ABUILD_WORKDIR=/home/builder/aports/${PWD#*/aports/}
-DOCKER="docker run -ti $ABUILD_VOLUMES -e DABUILD_DEBUG $DABUILD_ARGS"
-$DOCKER --workdir $ABUILD_WORKDIR \
- %%ABUILD_IMAGE%%:$ABUILD_VERSION-$DABUILD_ARCH "$@"
+docker run --tty --interactive \
+ $ABUILD_RM \
+ $ABUILD_VOLUMES \
+ -e DABUILD_DEBUG \
+ $DABUILD_ARGS \
+ --workdir /home/builder/aports/${PWD#*/aports/} \
+ %%ABUILD_IMAGE%%:$ABUILD_VERSION-$DABUILD_ARCH "$@"