diff options
| author | gjoranv <gv@yahoo-inc.com> | 2017-06-27 14:29:23 +0200 |
|---|---|---|
| committer | gjoranv <gv@yahoo-inc.com> | 2017-06-27 14:29:23 +0200 |
| commit | 295b1b55af1179babd5a4fafedc8a494ec23b671 (patch) | |
| tree | 5db0da58424536de8973ca8d9cde580354e5acb2 /docker | |
| parent | 37e072c994b3788d1fb3df92b98064508b548e20 (diff) | |
Move Dockerfile.run and run-vespa-internal.sh to new run/ folder.
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/build-vespa-image.sh | 2 | ||||
| -rwxr-xr-x | docker/run-vespa.sh | 4 | ||||
| -rw-r--r-- | docker/run/Dockerfile (renamed from docker/Dockerfile.run) | 0 | ||||
| -rwxr-xr-x | docker/run/run-vespa-internal.sh (renamed from docker/run-vespa-internal.sh) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/docker/build-vespa-image.sh b/docker/build-vespa-image.sh index d039e7dcabc..1680f4c057a 100755 --- a/docker/build-vespa-image.sh +++ b/docker/build-vespa-image.sh @@ -13,4 +13,4 @@ cd $DIR VESPA_VERSION=$1 DOCKER_IMAGE=vesparun -docker build -t "$DOCKER_IMAGE":"$VESPA_VERSION" --build-arg VESPA_VERSION="$VESPA_VERSION" -f Dockerfile.run . +docker build -t "$DOCKER_IMAGE":"$VESPA_VERSION" --build-arg VESPA_VERSION="$VESPA_VERSION" -f run/Dockerfile . diff --git a/docker/run-vespa.sh b/docker/run-vespa.sh index 6321f279bdd..e4e963e5f4b 100755 --- a/docker/run-vespa.sh +++ b/docker/run-vespa.sh @@ -14,8 +14,8 @@ VESPA_VERSION=$1 DOCKER_IMAGE=vesparun 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/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/run-vespa-internal.sh "$DOCKER_IMAGE":"$VESPA_VERSION" fi diff --git a/docker/Dockerfile.run b/docker/run/Dockerfile index 4116b12a00d..4116b12a00d 100644 --- a/docker/Dockerfile.run +++ b/docker/run/Dockerfile diff --git a/docker/run-vespa-internal.sh b/docker/run/run-vespa-internal.sh index e8c8c0d4d0e..e8c8c0d4d0e 100755 --- a/docker/run-vespa-internal.sh +++ b/docker/run/run-vespa-internal.sh |