Skip to content

Commit

Permalink
Merge pull request #4226 from aledbf/update-image
Browse files Browse the repository at this point in the history
Update nginx image
  • Loading branch information
k8s-ci-robot authored Jun 25, 2019
2 parents 1f28975 + d769c8a commit b40fca5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.88
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.89

ifeq ($(ARCH),arm64)
QEMUARCH=aarch64
Expand Down
2 changes: 1 addition & 1 deletion build/run-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set -o errexit
set -o nounset
set -o pipefail

E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v06232019-5bb168152
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v06242019-1f28975c2

DOCKER_OPTS=${DOCKER_OPTS:-""}

Expand Down
2 changes: 1 addition & 1 deletion images/e2e/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.88
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.89

RUN clean-install \
g++ \
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v06232019-5bb168152 AS BASE
FROM quay.io/kubernetes-ingress-controller/e2e:v06242019-1f28975c2 AS BASE

FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1

Expand Down

0 comments on commit b40fca5

Please sign in to comment.