Merge pull request #3644 from aledbf/update-ngx

Update nginx image
kubernetes · Jan 10, 2019 · 35f5a6c · 35f5a6c
2 parents e7a0a96 + d663f58
commit 35f5a6c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 
 # Set default base image dynamically for each arch
-BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.74
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.75
 
 ifeq ($(ARCH),arm64)
 	QEMUARCH=aarch64

diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh
@@ -40,7 +40,7 @@ if [ "$missing" = true ];then
   exit 1
 fi
 
-E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01042019-40487eea0
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01092019-b433108ea
 
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 

diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.74
+FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.75
 
 RUN clean-install \
   g++ \
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ if [ "$missing" = true ];then @@
       exit 1
     fi
-    E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01042019-40487eea0
+    E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01092019-b433108ea
     DOCKER_OPTS=${DOCKER_OPTS:-""}
@@ Expand Down @@