summaryrefslogtreecommitdiffstats
path: root/docker/README.md
diff options
context:
space:
mode:
authorKristian Aune <kkraune@users.noreply.github.com>2016-12-14 13:37:32 +0100
committerGitHub <noreply@github.com>2016-12-14 13:37:32 +0100
commit5e2a2f66885517cb021e2c927b3606d68713c9e5 (patch)
tree523216bd8f4f468c2d5da0e12a862316f144a982 /docker/README.md
parent7257ea9fe11d09e7e66f8ab258cad0fb56c94584 (diff)
Simplify OSX install
- Docker for Mac seems to work well - no need for Toolbox - Can we then drop osx-setup-docker-machine.sh as well?
Diffstat (limited to 'docker/README.md')
-rw-r--r--docker/README.md8
1 files changed, 0 insertions, 8 deletions
diff --git a/docker/README.md b/docker/README.md
index 59424ff2d98..eab565b2712 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -4,20 +4,14 @@
## Installing docker
[Docker installation](https://docs.docker.com/engine/installation/)
-*On OS X, the native Docker engine (Beta) has NOT been tested. Please use the [Docker Toolbox](https://www.docker.com/products/docker-toolbox).*
-
*On Linux, the default storage device is devicemapper with loopback device and max 10GB container size. This size is too small for a full build. Please see [here](http://www.projectatomic.io/blog/2016/03/daemon_option_basedevicesize/) and [here](http://www.projectatomic.io/blog/2015/06/notes-on-fedora-centos-and-docker-storage-drivers/) to overcome this limitation.*
## Building the Vespa RPM
-*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>``` to start Vespa.
This will create a Docker image which has the rpms from the build step (or downloaded rpms to this folder) installed. Vespa will be started inside the container.
@@ -25,8 +19,6 @@ This will create a Docker image which has the rpms from the build step (or downl
*On OS X, the container runs inside the Docker VM. Execute ```docker-machine ssh vespa-docker-machine``` to enter the VM. The services can also be reached directly from the host on the IP given by ```docker-machine ip vespa-docker-machine```*
## Building Vespa inside a Docker container
-*On OS X, execute ```source osx-setup-docker-machine.sh``` to setup the Docker VM in which to run Docker.*
-
Execute ```./enter-build-container.sh``` to enter the Vespa build environment inside a Docker container.
The container is entered at the root of the Vespa source repository. Follow the build sections in [README.md](https://github.com/yahoo/vespa/blob/master/README.md) to build and test.