kubernetes
/
examples
mirror of https://github.com/kubernetes/examples.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
David Oppenheimer 2014-11-12 14:10:58 -08:00
parent 84b8aab507
commit 651f70bca5
5 changed files with 4 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
update-demo/0-build-images.sh
View File

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

22
update-demo/images/base/Dockerfile
View File

@ -1,22 +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.
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"]

37
update-demo/images/base/default
View File

@ -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';
}
}
}

3
update-demo/images/kitten/Dockerfile
View File

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

3
update-demo/images/nautilus/Dockerfile
View File

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