From bfac5dd64c58d0a6d9323ce4497d368362711d05 Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Wed, 10 Sep 2014 13:42:19 -0700 Subject: [PATCH] Revert "Fix some readme and script bugs in examples." This reverts commit 42baed492b92769b469e1b3c470183990fe78b16. --- update-demo/README.md | 3 ++- update-demo/images/build-images.sh | 15 +++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/update-demo/README.md b/update-demo/README.md index d809a885..8baf41e6 100644 --- a/update-demo/README.md +++ b/update-demo/README.md @@ -23,6 +23,7 @@ This example assumes that you have forked the repository and [turned up a Kubern $ cd kubernetes $ hack/dev-build-and-up.sh + $ hack/build-go.sh This example also assumes that you have [Docker](http://docker.io) installed on your local machine. @@ -38,7 +39,7 @@ $ gcutil addfirewall --allowed=tcp:8080 --target_tags=kubernetes-minion kubernet ```shell $ cd kubernetes/examples/update-demo -$ images/build-images.sh +$ ./build-images.sh ``` ### Step Two: Turn up the UX for the demo diff --git a/update-demo/images/build-images.sh b/update-demo/images/build-images.sh index c058f7c2..25edd084 100755 --- a/update-demo/images/build-images.sh +++ b/update-demo/images/build-images.sh @@ -16,18 +16,17 @@ # This script will build and push the images necessary for the demo. -# If a user is provided, then use it. If not, environment var must be set. -if [ $# -eq 1 ] ; then - DOCKER_HUB_USER=$1 -elif [ -z "$DOCKER_HUB_USER" ] ; then +if (( $# != 1 )); then echo "Usage: $0 " exit 1 fi +DOCKER_USER=$1 + set -x -sudo docker build -t update-demo-base images/base -sudo docker build -t $DOCKER_HUB_USER/update-demo:kitten images/kitten -sudo docker build -t $DOCKER_HUB_USER/update-demo:nautilus images/nautilus +docker build -t update-demo-base base +docker build -t $DOCKER_USER/update-demo:kitten kitten +docker build -t $DOCKER_USER/update-demo:nautilus nautilus -sudo docker push $DOCKER_HUB_USER/update-demo +docker push $DOCKER_USER/update-demo