summaryrefslogtreecommitdiffstats
path: root/docker/README.md
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@yahoo-inc.com>2016-06-22 09:17:51 +0200
committerArnstein Ressem <aressem@yahoo-inc.com>2016-06-22 09:17:51 +0200
commitd966b0cd3cf8e72013793b3a83c07930d798d97e (patch)
treece7cf6c9daba217f7cf2b1f5ab67bfcbb7d8338b /docker/README.md
parent73650afbb8132f94716de91ecd9e01794dca74f7 (diff)
Added scripts for entering a build container.
Diffstat (limited to 'docker/README.md')
-rw-r--r--docker/README.md12
1 files changed, 10 insertions, 2 deletions
diff --git a/docker/README.md b/docker/README.md
index 38809e6e3d5..a937cae8934 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -7,7 +7,7 @@
*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 Vespa
+## 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.
@@ -21,4 +21,12 @@ Execute ```./run-vespa.sh <Vespa version number>``` to start Vespa.
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.*
+
+## 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.
+