aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-03-07 15:00:09 +0100
committerBjörn Gustavsson <[email protected]>2017-03-08 10:53:43 +0100
commitc1dab09a681edac9684afea4b6e2522475cea2f0 (patch)
tree7a25a35752e448e8a93d1f7e2da0a14e1f220e76
parentcc96d254379776c83aa85bad397a24fc4365c5c6 (diff)
downloadotp-c1dab09a681edac9684afea4b6e2522475cea2f0.tar.gz
otp-c1dab09a681edac9684afea4b6e2522475cea2f0.tar.bz2
otp-c1dab09a681edac9684afea4b6e2522475cea2f0.zip
builder-docker-otp: Fix passing of command
Pass all argument except the first as the command for "docker run".
-rwxr-xr-xscripts/build-docker-otp5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/build-docker-otp b/scripts/build-docker-otp
index d796759691..928b84a32d 100755
--- a/scripts/build-docker-otp
+++ b/scripts/build-docker-otp
@@ -1,13 +1,14 @@
#!/bin/bash
if [ $# -lt 1 ]; then
- echo "Usage $0 32|64 [command]"
+ echo "Usage $0 32|64 [command] [arg]..."
exit 1
fi
ARCH="$1"
+shift
git archive --format=tar.gz --prefix=otp/ HEAD >otp.tar.gz
docker build -t otp --file scripts/Dockerfile.$ARCH .
-docker run --volume="$PWD/logs:/buildroot/otp/logs" -i --rm otp $2
+docker run --volume="$PWD/logs:/buildroot/otp/logs" -i --rm otp ${1+"$@"}