From b8a64da78f4d5abaa2dba5b7ed0a06bdc319ee87 Mon Sep 17 00:00:00 2001
From: Vic Iglesias <viglesias@google.com>
Date: Mon, 12 Sep 2016 09:24:37 -0700
Subject: [PATCH] Fix test image (#72)

---
 test/Dockerfile        | 12 ++++++------
 test/e2e.sh            |  2 +-
 test/publish-docker.sh |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/Dockerfile b/test/Dockerfile
index 1a05bea624..5a63de032c 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -17,7 +17,7 @@ FROM debian:8.5
 ENV CLOUDSDK_CORE_DISABLE_PROMPTS=1 \
   PATH=/opt/google-cloud-sdk/bin:/opt/linux-amd64/:$PATH \
   HELM_VERSION=canary \
-  HELM_URL=https://storage.googleapis.com/kubernetes-charts-ci/helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \
+  HELM_URL=https://storage.googleapis.com/kubernetes-charts-ci/helm/helm-canary-linux-amd64.tar.gz \
   GOOGLE_CLOUD_SDK_VERSION=123.0.0 \
   GOOGLE_PROJECT=kubernetes-charts-ci
 
@@ -30,10 +30,10 @@ RUN set -x \
   && tar xfv google-cloud-sdk-${GOOGLE_CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \
   && ./google-cloud-sdk/install.sh \
   && gcloud components install kubectl \
-  && gcloud config set project ${GOOGLE_PROJECT} \
-  && wget -q ${HELM_URL} \
+  && gcloud config set project ${GOOGLE_PROJECT}
+RUN cd /opt && wget -q ${HELM_URL} \
   && tar xzfv helm-${HELM_VERSION}-linux-amd64.tar.gz \
-  && apt-get -y purge wget localepurge \
+RUN apt-get -y purge wget localepurge \
   && apt-get clean \
   && cd / \
   && rm -rf \
@@ -56,5 +56,5 @@ RUN set -x \
      /usr/share/man/ \
      /tmp/*
 
-VOLUME ["/src"]
-WORKDIR ["/src"]
+VOLUME "/src"
+WORKDIR "/src"
diff --git a/test/e2e.sh b/test/e2e.sh
index 337638d14d..03639b5b1b 100755
--- a/test/e2e.sh
+++ b/test/e2e.sh
@@ -18,7 +18,7 @@ set -o nounset
 set -o pipefail
 
 # TODO should we inject this.  This is creating problems bumping the Docker version
-IMAGE_VERSION="test-image:v1.6"
+IMAGE_VERSION="test-image:v1.7"
 CHART_ROOT=${CHART_ROOT:-$(git rev-parse --show-toplevel)}
 IMAGE_NAME=${IMAGE_NAME:-"gcr.io/kubernetes-charts-ci/${IMAGE_VERSION}"}
 
diff --git a/test/publish-docker.sh b/test/publish-docker.sh
index 78f382a991..6bc6a03429 100755
--- a/test/publish-docker.sh
+++ b/test/publish-docker.sh
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-VERSION=v1.6
+VERSION=v1.7
 CONTAINER_NAME=test-image
 
 usage() {