From 818cdaf9d3ce140e4d469a6e5390765ac5e2c6ee Mon Sep 17 00:00:00 2001
From: Jess Frazelle <me@jessfraz.com>
Date: Wed, 20 Jul 2016 09:38:32 -0400
Subject: [PATCH] add golint to test dockerfile

Signed-off-by: Jess Frazelle <me@jessfraz.com>
---
 hack/jenkins/dockerized-e2e-runner.sh | 2 +-
 hack/jenkins/gotest-dockerized.sh     | 2 +-
 hack/jenkins/test-image/Dockerfile    | 2 ++
 hack/jenkins/test-image/Makefile      | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hack/jenkins/dockerized-e2e-runner.sh b/hack/jenkins/dockerized-e2e-runner.sh
index fc4f3661229..aaf80cc06e2 100755
--- a/hack/jenkins/dockerized-e2e-runner.sh
+++ b/hack/jenkins/dockerized-e2e-runner.sh
@@ -61,5 +61,5 @@ docker run --rm=true -i \
   -e "WORKSPACE=/workspace" \
   ${KUBEKINS_SERVICE_ACCOUNT_FILE:+-e "KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"} \
   "${docker_extra_args[@]:+${docker_extra_args[@]}}" \
-  gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev1 \
+  gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev2 \
   bash -c "bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"
diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh
index af48fbc6b7d..01c246a2ca7 100755
--- a/hack/jenkins/gotest-dockerized.sh
+++ b/hack/jenkins/gotest-dockerized.sh
@@ -44,5 +44,5 @@ docker run --rm=true \
   -e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
   -e "REPO_DIR=${REPO_DIR}" \
   -e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \
-  -i gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev1 \
+  -i gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev2 \
   bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"
diff --git a/hack/jenkins/test-image/Dockerfile b/hack/jenkins/test-image/Dockerfile
index f18e68302f8..af725f9cb96 100644
--- a/hack/jenkins/test-image/Dockerfile
+++ b/hack/jenkins/test-image/Dockerfile
@@ -44,6 +44,8 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \
 RUN curl -L "https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" |\
   tar -C /usr/bin -xvzf- --strip-components=3 usr/local/bin/docker
 
+RUN go get github.com/golang/lint/golint
+
 RUN mkdir -p /go/src/k8s.io/kubernetes \
 	&& ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes
 
diff --git a/hack/jenkins/test-image/Makefile b/hack/jenkins/test-image/Makefile
index b2ddeef71e7..20452250fcb 100644
--- a/hack/jenkins/test-image/Makefile
+++ b/hack/jenkins/test-image/Makefile
@@ -16,7 +16,7 @@ all: push
 
 # Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
 # These versions are specified in the Dockerfile
-TAG = go1.6.3-docker1.9.1-rev1
+TAG = go1.6.3-docker1.9.1-rev2
 
 container:
 	docker build -t gcr.io/google_containers/kubekins-test .