diff options
author | Arnstein Ressem <aressem@gmail.com> | 2016-06-21 18:34:49 +0200 |
---|---|---|
committer | Arnstein Ressem <aressem@gmail.com> | 2016-06-21 18:34:49 +0200 |
commit | 9b5d39e4058e9855d171ff5b94dde070b13deeed (patch) | |
tree | e1a09383e50e4e410eebcdb81daf60a95e9ea9cb /docker | |
parent | 8f5cfcdd54ab439e09ae6d9e7da7011247231465 (diff) |
Some MD formatting that did not look good on GitHub.
Diffstat (limited to 'docker')
-rw-r--r-- | docker/README.md | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docker/README.md b/docker/README.md index 53e5a392ebc..6bb4ae2a95b 100644 --- a/docker/README.md +++ b/docker/README.md @@ -4,21 +4,20 @@ ## 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).* - +*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.* +*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.* +*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. + +*On OS X, the container runs inside the Docker VM. Execute ```docker-machine ssh vespa-docker-machine```to enter the VM. |