From 7b51698c36bd8793461aeeba9627535607b8def4 Mon Sep 17 00:00:00 2001 From: Gurpartap Singh Date: Fri, 26 Sep 2014 06:01:59 +0530 Subject: [PATCH 1/4] Update README.md GoogleCloudPlatform/kubernetes#1454 --- examples/guestbook-go/_src/README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/examples/guestbook-go/_src/README.md b/examples/guestbook-go/_src/README.md index 6bf9b4640e2..6689eb5d963 100644 --- 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") From e506e520189ee01c93c1f4fb976d618d5773afcf Mon Sep 17 00:00:00 2001 From: Gurpartap Singh Date: Fri, 26 Sep 2014 10:50:27 +0530 Subject: [PATCH 2/4] Use builder instead of build --- examples/guestbook-go/_src/script/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/guestbook-go/_src/script/build.sh b/examples/guestbook-go/_src/script/build.sh index 319db022209..83acbdaba0c 100755 --- 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 - From ce99720239172c924f332e30db372c9b8633743b Mon Sep 17 00:00:00 2001 From: Gurpartap Singh Date: Fri, 26 Sep 2014 10:50:51 +0530 Subject: [PATCH 3/4] Use builder instead of build --- examples/guestbook-go/_src/script/clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/guestbook-go/_src/script/clean.sh b/examples/guestbook-go/_src/script/clean.sh index 957d2312d62..65409850082 100755 --- a/examples/guestbook-go/_src/script/clean.sh +++ b/examples/guestbook-go/_src/script/clean.sh @@ -21,5 +21,5 @@ set -o nounset set -o pipefail docker rm -f guestbook-build 2> /dev/null || true -docker rmi -f kubernetes/guestbook-build || true +docker rmi -f kubernetes/guestbook-builder || true docker rmi -f kubernetes/guestbook || true From 3d89dbccca086f9829356b68c3c2716c7a9d6580 Mon Sep 17 00:00:00 2001 From: Gurpartap Singh Date: Fri, 26 Sep 2014 10:51:09 +0530 Subject: [PATCH 4/4] One last time. --- examples/guestbook-go/_src/script/clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/guestbook-go/_src/script/clean.sh b/examples/guestbook-go/_src/script/clean.sh index 65409850082..892b48c49e6 100755 --- 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 rm -f guestbook-builder 2> /dev/null || true docker rmi -f kubernetes/guestbook-builder || true docker rmi -f kubernetes/guestbook || true