Skip to content

Update NGINX version to 1.11.13, golang to 1.8 #135

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

Merged
merged 1 commit into from
Apr 14, 2017
Merged

Update NGINX version to 1.11.13, golang to 1.8 #135

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nginx-controller/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.11.8
FROM nginx:1.11.13

# forward nginx access and error logs to stdout and stderr of the ingress
# controller process
Expand Down
2 changes: 1 addition & 1 deletion nginx-controller/DockerfileForAlpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.11.8-alpine
FROM nginx:1.11.13-alpine

# forward nginx access and error logs to stdout and stderr of the ingress
# controller process
Expand Down
2 changes: 1 addition & 1 deletion nginx-controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ TAG = $(VERSION)
PREFIX = nginxdemos/nginx-ingress

DOCKER_RUN = docker run --rm -v $(shell pwd)/../:/go/src/github.com/nginxinc/kubernetes-ingress -w /go/src/github.com/nginxinc/kubernetes-ingress/nginx-controller/
GOLANG_CONTAINER = golang:1.7
GOLANG_CONTAINER = golang:1.8
DOCKERFILE = Dockerfile

BUILD_IN_CONTAINER = 1
Expand Down
2 changes: 1 addition & 1 deletion nginx-plus-controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ TAG = $(VERSION)
PREFIX =

DOCKER_RUN = docker run --rm -v $(shell pwd)/../:/go/src/github.com/nginxinc/kubernetes-ingress -w /go/src/github.com/nginxinc/kubernetes-ingress/nginx-plus-controller/
GOLANG_CONTAINER = golang:1.7
GOLANG_CONTAINER = golang:1.8

BUILD_IN_CONTAINER = 1
PUSH_TO_GCR =
Expand Down