diff options
| author | Geir Storli <geirst@yahoo-inc.com> | 2017-06-20 14:17:56 +0200 |
|---|---|---|
| committer | Geir Storli <geirst@yahoo-inc.com> | 2017-06-20 14:17:56 +0200 |
| commit | fb811b95237823ed4be3413231dda817999e6ccb (patch) | |
| tree | efb6285dabdedebd3b23b9e5f976cdefc5937ef7 /docker/run-vespa.sh | |
| parent | 86e346744713ce715b94ae70a0233f46c4ab61c4 (diff) | |
Move building of docker image to separate script and tag it with version number.
Diffstat (limited to 'docker/run-vespa.sh')
| -rwxr-xr-x | docker/run-vespa.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docker/run-vespa.sh b/docker/run-vespa.sh index 4f05c995156..6321f279bdd 100755 --- a/docker/run-vespa.sh +++ b/docker/run-vespa.sh @@ -13,11 +13,9 @@ cd $DIR VESPA_VERSION=$1 DOCKER_IMAGE=vesparun -docker build -t "$DOCKER_IMAGE" -f Dockerfile.run . - if [ "$(uname)" != "Darwin" ]; then - docker run -d -v $(pwd)/..:/vespa --net=host --privileged --entrypoint /vespa/docker/run-vespa-internal.sh "$DOCKER_IMAGE" "$VESPA_VERSION" + docker run -d -v $(pwd)/..:/vespa --net=host --privileged --entrypoint /vespa/docker/run-vespa-internal.sh "$DOCKER_IMAGE":"$VESPA_VERSION" else # On OS X, net=host does not work. Need to explicitly expose ports from localhost into container. - docker run -d -p 8080:8080 -p 19071:19071 -v $(pwd)/..:/vespa --privileged --entrypoint /vespa/docker/run-vespa-internal.sh "$DOCKER_IMAGE" "$VESPA_VERSION" + docker run -d -p 8080:8080 -p 19071:19071 -v $(pwd)/..:/vespa --privileged --entrypoint /vespa/docker/run-vespa-internal.sh "$DOCKER_IMAGE":"$VESPA_VERSION" fi |