Move building of docker image to separate script and tag it with version number.

1 files changed, 12 insertions, 5 deletions

diff --git a/docker/README.md b/docker/README.md
index e3105b9263a..a89405ad80d 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -7,20 +7,27 @@
 *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
+## Building Vespa RPM
 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. The version number will be compiled into binaries, but has no other meaning than that.
+The produced rpms will be available in this folder after compilation.
+The version number will be compiled into binaries, but has no other meaning than that.
 
 
 ## Building and testing Vespa
 Execute ```./vespa-ci.sh <git commit>``` to build and test a specific branch/tag/commit.
 
 
-## Running Vespa
+## Building Vespa Docker image
+Execute ```./build-vespa-image.sh <Vespa version number>``` to build a Docker image (*vesparun*) which has the rpms
+from the build step (or downloaded rpms into this folder) installed.
+
+
+## Running Vespa inside Docker container
 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.
+This starts a Docker container using the Docker image (*vesparun*) from the previous step.
+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. The services can also be reached directly from the host on the IP given by ```docker-machine ip vespa-docker-machine```*
 
@@ -32,7 +39,7 @@ The container is entered at the root of the Vespa source repository. Follow the
 
 
 ## Troubleshooting
-- Use ```docker logs CONTAINER``` for output - useful if the commands above fail
+- Use ```docker logs CONTAINER``` for output - useful if the commands above fail.
 
 - If the build fails, start from scratch: ```docker rmi -f vesparun vespabuild``` - then build again. Clean local docker if docker image disk full:
     - ```docker rm -v $(docker ps -a -q -f status=exited)```