diff --git a/contrib/for-demos/serve_hostname/Dockerfile b/contrib/for-demos/serve_hostname/Dockerfile index cb04aeddd5b..07b614b74cf 100644 --- a/contrib/for-demos/serve_hostname/Dockerfile +++ b/contrib/for-demos/serve_hostname/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM scratch MAINTAINER Tim Hockin ADD serve_hostname /serve_hostname ADD serve_hostname.go /serve_hostname.go diff --git a/contrib/for-demos/serve_hostname/Makefile b/contrib/for-demos/serve_hostname/Makefile index 1a44148ef4c..89a23d200bb 100644 --- a/contrib/for-demos/serve_hostname/Makefile +++ b/contrib/for-demos/serve_hostname/Makefile @@ -1,6 +1,6 @@ all: serve_hostname -TAG = 1.0 +TAG = 1.1 serve_hostname: serve_hostname.go CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./serve_hostname.go diff --git a/hack/e2e-suite/basic.sh b/hack/e2e-suite/basic.sh index c09cf15e194..97d842c5de7 100755 --- a/hack/e2e-suite/basic.sh +++ b/hack/e2e-suite/basic.sh @@ -34,7 +34,7 @@ function teardown() { trap "teardown" EXIT # Determine which pod image to launch (e.g. private.sh launches a different one). -pod_img_srv="${POD_IMG_SRV:-kubernetes/serve_hostname}" +pod_img_srv="${POD_IMG_SRV:-kubernetes/serve_hostname:1.1}" # Launch some pods. num_pods=2 diff --git a/hack/e2e-suite/private.sh b/hack/e2e-suite/private.sh index 838464b7edd..19c8908d3e1 100755 --- a/hack/e2e-suite/private.sh +++ b/hack/e2e-suite/private.sh @@ -32,5 +32,5 @@ if [[ "${KUBERNETES_PROVIDER}" != "gce" ]] && [[ "${KUBERNETES_PROVIDER}" != "gk fi # Run the basic.sh test, but using this image. -export POD_IMG_SRV="gcr.io/_b_k8s_test/serve_hostname:1.0" +export POD_IMG_SRV="gcr.io/_b_k8s_test/serve_hostname:1.1" source "${KUBE_ROOT}/hack/e2e-suite/basic.sh" diff --git a/test/e2e/basic.go b/test/e2e/basic.go index 4fb474dd26e..b8ca60ce9db 100644 --- a/test/e2e/basic.go +++ b/test/e2e/basic.go @@ -187,5 +187,5 @@ func TestBasicImage(c *client.Client, test string, image string) bool { // TestBasic performs the TestBasicImage check with the // image kubernetes/serve_hostname func TestBasic(c *client.Client) bool { - return TestBasicImage(c, "basic", "kubernetes/serve_hostname:1.0") + return TestBasicImage(c, "basic", "kubernetes/serve_hostname:1.1") }