Merge pull request #3820 from aledbf/master

Update nginx image
kubernetes · Feb 26, 2019 · 4ed3339 · 4ed3339
2 parents ec3a2d6 + f899506
commit 4ed3339
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -59,7 +59,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.79
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.80
 
 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:v02252019-286c1f306
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v02262019-ec3a2d6bc
 
 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.79
+FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.80
 
 RUN clean-install \
   g++ \

diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kubernetes-ingress-controller/e2e:v02252019-286c1f306 AS BASE
+FROM quay.io/kubernetes-ingress-controller/e2e:v02262019-ec3a2d6bc AS BASE
 
 FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
-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:v02252019-286c1f306
+    E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v02262019-ec3a2d6bc
     DOCKER_OPTS=${DOCKER_OPTS:-""}
@@ Expand Down @@