diff options
-rw-r--r-- | docker/README.md | 24 | ||||
-rwxr-xr-x | docker/build-vespa-internal.sh | 1 | ||||
-rwxr-xr-x | docker/build-vespa.sh | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/docker/README.md b/docker/README.md index e69de29bb2d..53e5a392ebc 100644 --- a/docker/README.md +++ b/docker/README.md @@ -0,0 +1,24 @@ + +# Building and running Vespa on Docker (OS X and Linux) + +## Installing docker +[Docker installation](https://docs.docker.com/engine/installation/) + +>*On OS X, the native Docker engine has **not** been tested. Please use the [Docker Toolbox](https://www.docker.com/products/docker-toolbox).* + + +## Building Vespa +> *On OS X, execute ```source osx-setup-docker-machine.sh``` to setup the Docker VM in which to run Docker.* + +Execute ```./build-vespa.sh <Vespa version number>``` to build Vespa from this source code. + +The produced rpms will be available in this folder after compiliation. + + +## Running Vespa +> *On OS X, execute ```source osx-setup-docker-machine.sh``` to setup the Docker VM in which to run Docker.* + +Execute ```./run-vespa.sh <Vespa version number>``` + +This will create a Docker image which has the rpms from the build step installed. Vespa will be started inside the container. +> *On OS X, the container runs inside the Docker VM. Execute ```docker-machine ssh vespa-docker-machine```to enter the VM. diff --git a/docker/build-vespa-internal.sh b/docker/build-vespa-internal.sh index 37ba1433e4e..ee92c156ee0 100755 --- a/docker/build-vespa-internal.sh +++ b/docker/build-vespa-internal.sh @@ -3,6 +3,7 @@ set -e if [ $# -ne 1 ]; then echo "Usage: $0 <vespa version>" + exit 1 fi VESPA_VERSION=$1 diff --git a/docker/build-vespa.sh b/docker/build-vespa.sh index 44023aedfbd..06f2d12d24d 100755 --- a/docker/build-vespa.sh +++ b/docker/build-vespa.sh @@ -3,6 +3,7 @@ set -e if [ $# -ne 1 ]; then echo "Usage: $0 <vespa version>" + exit 1 fi VESPA_VERSION=$1 |