diff --git a/Makefile b/Makefile index f7ef16fb3..b1a422a07 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,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.89 +BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.90 ifeq ($(ARCH),arm64) QEMUARCH=aarch64 diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index 10c00bacb..049f866f5 100755 --- a/build/run-in-docker.sh +++ b/build/run-in-docker.sh @@ -22,7 +22,7 @@ set -o errexit set -o nounset set -o pipefail -E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v06242019-1f28975c2 +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v06262019-ecce3fd7b DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 77fb79131..2ec28f79d 100644 --- 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.89 +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.90 RUN clean-install \ g++ \ diff --git a/images/nginx/README.md b/images/nginx/README.md index 2485a637d..5af6212d0 100644 --- a/images/nginx/README.md +++ b/images/nginx/README.md @@ -20,7 +20,7 @@ This image provides a default configuration file with no backend servers. _Using docker_ ```console -docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro quay.io/kubernetes-ingress-controller/nginx:0.89 +docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro quay.io/kubernetes-ingress-controller/nginx:0.90 ``` _Creating a replication controller_ diff --git a/images/nginx/rc.yaml b/images/nginx/rc.yaml index 39357b085..084109814 100644 --- a/images/nginx/rc.yaml +++ b/images/nginx/rc.yaml @@ -38,7 +38,7 @@ spec: spec: containers: - name: nginx - image: quay.io/kubernetes-ingress-controller/nginx:0.89 + image: quay.io/kubernetes-ingress-controller/nginx:0.90 ports: - containerPort: 80 - containerPort: 443 diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index a526913cc..388195e49 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/kubernetes-ingress-controller/e2e:v06242019-1f28975c2 AS BASE +FROM quay.io/kubernetes-ingress-controller/e2e:v06262019-ecce3fd7b AS BASE FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1