diff --git a/echoheaders/Dockerfile b/echoheaders/Dockerfile index 2f320ab06..fd3b042f0 100644 --- a/echoheaders/Dockerfile +++ b/echoheaders/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/google_containers/nginx-slim:0.3 +FROM gcr.io/google_containers/nginx-slim:0.6 MAINTAINER Prashanth B ADD nginx.conf /etc/nginx/nginx.conf ADD README.md README.md diff --git a/echoheaders/Makefile b/echoheaders/Makefile index e51fdeea1..760e56ea6 100644 --- a/echoheaders/Makefile +++ b/echoheaders/Makefile @@ -1,7 +1,7 @@ all: push # TAG 0.0 shouldn't clobber any release builds -TAG = 1.3 +TAG = 1.4 PREFIX = gcr.io/google_containers/echoserver container: diff --git a/echoheaders/README.md b/echoheaders/README.md index b9cc0c54f..84349a235 100644 --- a/echoheaders/README.md +++ b/echoheaders/README.md @@ -1,6 +1,7 @@ # Echoserver This is a simple server that responds with the http headers it received. +Image versions >= 1.4 removes the redirect introduced in 1.3. Image versions >= 1.3 redirect requests on :80 with `X-Forwarded-Proto: http` to :443. Image versions > 1.0 run an nginx server, and implement the echoserver using lua in the nginx config. Image versions <= 1.0 run a python http server instead of nginx, and don't redirect any requests. diff --git a/echoheaders/echo-app.yaml b/echoheaders/echo-app.yaml index c4d357bf9..9c5a8b94a 100644 --- a/echoheaders/echo-app.yaml +++ b/echoheaders/echo-app.yaml @@ -27,6 +27,6 @@ spec: spec: containers: - name: echoheaders - image: gcr.io/google_containers/echoserver:1.3 + image: gcr.io/google_containers/echoserver:1.4 ports: - containerPort: 8080 diff --git a/echoheaders/nginx.conf b/echoheaders/nginx.conf index 5ce215a4b..0d663510c 100644 --- a/echoheaders/nginx.conf +++ b/echoheaders/nginx.conf @@ -17,9 +17,6 @@ http { # Replace '_' with your hostname. server_name _; - if ($http_x_forwarded_proto = "http") { - return 301 https://$host$request_uri; - } location / { lua_need_request_body on;