Revert redirect to ssl

This commit is contained in:
Manuel de Brito Fontes 2016-05-19 16:11:51 -03:00
parent ca620e4074
commit 6ead83512e
5 changed files with 4 additions and 6 deletions

View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 <beeps@google.com> MAINTAINER Prashanth B <beeps@google.com>
ADD nginx.conf /etc/nginx/nginx.conf ADD nginx.conf /etc/nginx/nginx.conf
ADD README.md README.md ADD README.md README.md

View file

@ -1,7 +1,7 @@
all: push all: push
# TAG 0.0 shouldn't clobber any release builds # TAG 0.0 shouldn't clobber any release builds
TAG = 1.3 TAG = 1.4
PREFIX = gcr.io/google_containers/echoserver PREFIX = gcr.io/google_containers/echoserver
container: container:

View file

@ -1,6 +1,7 @@
# Echoserver # Echoserver
This is a simple server that responds with the http headers it received. 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.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 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. Image versions <= 1.0 run a python http server instead of nginx, and don't redirect any requests.

View file

@ -27,6 +27,6 @@ spec:
spec: spec:
containers: containers:
- name: echoheaders - name: echoheaders
image: gcr.io/google_containers/echoserver:1.3 image: gcr.io/google_containers/echoserver:1.4
ports: ports:
- containerPort: 8080 - containerPort: 8080

View file

@ -17,9 +17,6 @@ http {
# Replace '_' with your hostname. # Replace '_' with your hostname.
server_name _; server_name _;
if ($http_x_forwarded_proto = "http") {
return 301 https://$host$request_uri;
}
location / { location / {
lua_need_request_body on; lua_need_request_body on;