From 42baed492b92769b469e1b3c470183990fe78b16 Mon Sep 17 00:00:00 2001 From: Max Forbes Date: Wed, 10 Sep 2014 13:34:36 -0700 Subject: [PATCH] Fix some readme and script bugs in examples. --- docs/getting-started-guides/gce.md | 2 +- examples/update-demo/README.md | 3 +-- examples/update-demo/images/build-images.sh | 15 ++++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/getting-started-guides/gce.md b/docs/getting-started-guides/gce.md index 9b3ae689982..5c462e8a7e6 100644 --- a/docs/getting-started-guides/gce.md +++ b/docs/getting-started-guides/gce.md @@ -5,7 +5,7 @@ 1. You need a Google Cloud Platform account with billing enabled. Visit [http://cloud.google.com/console](http://cloud.google.com/console) for more details. 2. Make sure you can start up a GCE VM. At least make sure you can do the [Create an instance](https://developers.google.com/compute/docs/quickstart#addvm) part of the GCE Quickstart. -3. You need to have the Google Storage API, and the Google Storage JSON API enabled. +3. You need to have the Google Cloud Storage API, and the Google Cloud Storage JSON API enabled. 4. You must have Go (version 1.2 or later) installed: [www.golang.org](http://www.golang.org). 5. You must have the [`gcloud` components](https://developers.google.com/cloud/sdk/) installed. 6. Ensure that your `gcloud` components are up-to-date by running `gcloud components update`. diff --git a/examples/update-demo/README.md b/examples/update-demo/README.md index 8baf41e6643..d809a885634 100644 --- a/examples/update-demo/README.md +++ b/examples/update-demo/README.md @@ -23,7 +23,6 @@ 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. @@ -39,7 +38,7 @@ $ gcutil addfirewall --allowed=tcp:8080 --target_tags=kubernetes-minion kubernet ```shell $ cd kubernetes/examples/update-demo -$ ./build-images.sh +$ images/build-images.sh ``` ### Step Two: Turn up the UX for the demo diff --git a/examples/update-demo/images/build-images.sh b/examples/update-demo/images/build-images.sh index 25edd084a47..c058f7c26d1 100755 --- a/examples/update-demo/images/build-images.sh +++ b/examples/update-demo/images/build-images.sh @@ -16,17 +16,18 @@ # This script will build and push the images necessary for the demo. -if (( $# != 1 )); then +# 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 echo "Usage: $0 " exit 1 fi -DOCKER_USER=$1 - set -x -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 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 push $DOCKER_USER/update-demo +sudo docker push $DOCKER_HUB_USER/update-demo