Merge pull request #2336 from davidopp/master

Change update example to use a trivial webserver instead of nginx (issue...

contrib/for-demos/test-webserver/Dockerfile

@@ -12,11 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM dockerfile/nginx
-
-ADD default /etc/nginx/sites-available/default
-
-ONBUILD ADD html /usr/share/nginx/html
-ONBUILD RUN chmod -R a+r /usr/share/nginx/html
-
-CMD ["nginx"]
+FROM scratch
+MAINTAINER David Oppenheimer <davidopp@google.com>
+ADD test-webserver test-webserver
+EXPOSE 80
+ENTRYPOINT ["/test-webserver"]

contrib/for-demos/test-webserver/Makefile

@@ -0,0 +1,13 @@
+all: push
+
+test-webserver: test-webserver.go
+	CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w' ./test-webserver.go
+
+container: test-webserver
+	sudo docker build -t kubernetes/test-webserver .
+
+push: container
+	sudo docker push kubernetes/test-webserver
+
+clean:
+	rm -f test-webserver

contrib/for-demos/test-webserver/test-webserver.go

@@ -0,0 +1,49 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+
+// A tiny web server that serves a static file.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"net/http"
+)
+
+var (
+	port = flag.Int("port", 80, "Port number.")
+)
+
+func main() {
+	flag.Parse()
+
+	fs := http.StripPrefix("/", http.FileServer(http.Dir("/")))
+
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Cache-Control", "private")
+		// Needed for local proxy to Kubernetes API server to work.
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+		w.Header().Set("Access-Control-Allow-Credentials", "true")
+		w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
+		w.Header().Set("Access-Control-Allow-Headers", "DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type")
+		fs.ServeHTTP(w, r)
+	})
+
+	go log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", *port), nil))
+
+	select {}
+}

examples/update-demo/0-build-images.sh

@@ -27,7 +27,6 @@ fi
 
 set -x
 
-docker build -t update-demo-base images/base
 docker build -t "${DOCKER_HUB_USER}/update-demo:kitten" images/kitten
 docker build -t "${DOCKER_HUB_USER}/update-demo:nautilus" images/nautilus
 

examples/update-demo/images/base/default

@@ -1,37 +0,0 @@
-# Copyright 2014 Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-server {
-  listen 80 default_server;
-  listen [::]:80 default_server ipv6only=on;
-
-  root /usr/share/nginx/html;
-  index index.html index.htm;
-
-  # Make site accessible from http://localhost/
-  server_name localhost;
-
-  location / {
-    try_files $uri $uri/ =404;
-    expires           0;
-    add_header        Cache-Control private;
-
-    if ($request_method = 'GET') {
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Credentials' 'true';
-      add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-      add_header 'Access-Control-Allow-Headers' 'DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-    }
-  }
-}

examples/update-demo/images/kitten/Dockerfile

@@ -12,4 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM update-demo-base
+FROM kubernetes/test-webserver
+ADD html/data.json html/kitten.jpg /

examples/update-demo/images/nautilus/Dockerfile

@@ -12,4 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM update-demo-base
+FROM kubernetes/test-webserver
+ADD html/data.json html/nautilus.jpg /

hack/e2e-suite/update.sh

@@ -102,7 +102,7 @@ function validate() {
   return 0
 }
 
-export DOCKER_HUB_USER=jbeda
+export DOCKER_HUB_USER=davidopp
 
 # Launch a container
 ${KUBE_ROOT}/examples/update-demo/2-create-replication-controller.sh