Merge pull request #3908 from aledbf/update-nginx

Update nginx image
kubernetes · Mar 21, 2019 · ec81605 · ec81605
2 parents d3b9795 + 0bd5f5e
commit ec81605
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -60,7 +60,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.81
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.82
 
 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:v03012019-1ad00f305
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03192019-080bed8e8
 
 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.81
+FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.82
 
 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:v03012019-1ad00f305 AS BASE
+FROM quay.io/kubernetes-ingress-controller/e2e:v03192019-080bed8e8 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:v03012019-1ad00f305
+    E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03192019-080bed8e8
     DOCKER_OPTS=${DOCKER_OPTS:-""}
@@ Expand Down @@