Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix update-demo to work correctly with a web browser. #2832

Merged
merged 1 commit into from
Dec 11, 2014
Merged

Fix update-demo to work correctly with a web browser. #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion contrib/for-demos/test-webserver/test-webserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ func main() {
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")
w.Header().Set("Access-Control-Allow-Headers", "DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,Cache-Control,Content-Type")
// Disable If-Modified-Since so update-demo isn't broken by 304s
r.Header.Del("If-Modified-Since")
fs.ServeHTTP(w, r)
})

Expand Down
3 changes: 2 additions & 1 deletion examples/update-demo/images/kitten/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
# limitations under the License.

FROM kubernetes/test-webserver
ADD html/data.json html/kitten.jpg /
COPY html/kitten.jpg kitten.jpg
COPY html/data.json data.json
3 changes: 2 additions & 1 deletion examples/update-demo/images/nautilus/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
# limitations under the License.

FROM kubernetes/test-webserver
ADD html/data.json html/nautilus.jpg /
COPY html/nautilus.jpg nautilus.jpg
COPY html/data.json data.json