github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reduce size of serve_hostname image

pull/6/head
Satnam Singh 2015-01-23 17:54:29 -08:00
parent 426c16e8e5
commit 3841d1b5d1
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/for-demos/serve_hostname/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:14.04
FROM scratch
MAINTAINER Tim Hockin <thockin@google.com>
ADD serve_hostname /serve_hostname
ADD serve_hostname.go /serve_hostname.go

2
contrib/for-demos/serve_hostname/Makefile
View File

@ -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

2
hack/e2e-suite/basic.sh
View File

@ -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

2
hack/e2e-suite/private.sh
View File

@ -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"

2
test/e2e/basic.go
View File

@ -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")
}