Merge pull request #1 from Gurpartap/patch-1

Remove DOCKER_BIN and boot2docker instructions from README.md
kubernetes · Sep 26, 2014 · f6e688f · f6e688f
2 parents 964be36 + 3d89dbc
commit f6e688f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/examples/guestbook-go/_src/README.md b/examples/guestbook-go/_src/README.md
@@ -1,6 +1,6 @@
 ## Building and releasing Guestbook Image
 
-Guestbook build process employs the usage of docker-in-docker to build an image within another. This requires that the build image has access to the `docker` program's binary, which defaults to the docker available on your host machine. In the case of boot2docker, `DOCKER_BIN` must be set to the binary's location in the boot2docker's vm.
+This process employs building two docker images, one compiles the source and the other hosts the compiled binaries.
 
 Releasing the image requires that you have access to the docker registry user account which will host the image.
 
@@ -9,10 +9,6 @@ To build and release the guestbook image:
     cd examples/guestbook-go/_src
     ./script/release.sh
 
-If you're using boot2docker, specify the `DOCKER_BIN` environment variable
-
-    DOCKER_BIN="$(boot2docker ssh which docker)" ./script/release.sh
-
 #### Step by step
 
 If you may want to, you can build and push the image step by step.
@@ -27,10 +23,6 @@ Builds a docker image that builds the app and packages it into a minimal docker
 
     ./script/build.sh
 
-If you're using boot2docker, specify the `DOCKER_BIN` environment variable
-
-    DOCKER_BIN="$(boot2docker ssh which docker)" ./script/build.sh
-
 ###### Push
 
 Accepts an optional tag (defaults to "latest")

diff --git a/examples/guestbook-go/_src/script/build.sh b/examples/guestbook-go/_src/script/build.sh
@@ -20,5 +20,5 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-docker build --rm --force-rm -t kubernetes/guestbook-build .
-docker run --rm kubernetes/guestbook-build | docker build -t kubernetes/guestbook -
+docker build --rm --force-rm -t kubernetes/guestbook-builder .
+docker run --rm kubernetes/guestbook-builder | docker build -t kubernetes/guestbook -
diff --git a/examples/guestbook-go/_src/script/clean.sh b/examples/guestbook-go/_src/script/clean.sh
@@ -20,6 +20,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-docker rm -f guestbook-build 2> /dev/null || true
-docker rmi -f kubernetes/guestbook-build || true
+docker rm -f guestbook-builder 2> /dev/null || true
+docker rmi -f kubernetes/guestbook-builder || true
 docker rmi -f kubernetes/guestbook || true