diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2016-06-22 01:30:16 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@gmail.com> | 2016-06-22 01:30:16 +0200 |
| commit | 18e18c4a77a549606a75f10948f21d21553f7771 (patch) | |
| tree | a425798548c605d3f29b909c3fad7040ff99023d /docker/build-vespa.sh | |
| parent | 1d786a57d5e1b1a782458a928258281ab9c05943 (diff) | |
Fixed build scripts and added run scripts.
Diffstat (limited to 'docker/build-vespa.sh')
| -rwxr-xr-x | docker/build-vespa.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docker/build-vespa.sh b/docker/build-vespa.sh index d860207964d..6d3b1699bc5 100755 --- a/docker/build-vespa.sh +++ b/docker/build-vespa.sh @@ -5,12 +5,13 @@ if [ $# -ne 1 ]; then echo "Usage: $0 <vespa version>" exit 1 fi -VESPA_VERSION=$1 -docker build -t vespabuild -f Dockerfile.build . +DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) +cd $DIR -TMP=$(mktemp -d) -docker run --rm -v $(pwd)/..:/vespa -v $TMP:/root/rpmbuild --entrypoint /vespa/docker/build-vespa-internal.sh vespabuild "$VESPA_VERSION" +VESPA_VERSION=$1 +DOCKER_IMAGE="vespabuild" -rm -rf $TMP +docker build -t "$DOCKER_IMAGE" -f Dockerfile.build . +docker run --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/build-vespa-internal.sh "$DOCKER_IMAGE" "$VESPA_VERSION" "$(id -u)" "$(id -g)" |