Update nginx image (#3530)
This commit is contained in:
parent
58057a2d25
commit
ea89d27b5d
3 changed files with 4 additions and 17 deletions
17
Makefile
17
Makefile
|
@ -50,7 +50,7 @@ DUMB_ARCH = ${ARCH}
|
||||||
|
|
||||||
GOBUILD_FLAGS :=
|
GOBUILD_FLAGS :=
|
||||||
|
|
||||||
ALL_ARCH = amd64 arm arm64 ppc64le
|
ALL_ARCH = amd64 arm64
|
||||||
|
|
||||||
QEMUVERSION = v3.0.0
|
QEMUVERSION = v3.0.0
|
||||||
|
|
||||||
|
@ -61,24 +61,11 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
|
||||||
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
|
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
|
||||||
|
|
||||||
# Set default base image dynamically for each arch
|
# Set default base image dynamically for each arch
|
||||||
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.71
|
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.72
|
||||||
|
|
||||||
ifeq ($(ARCH),arm)
|
|
||||||
QEMUARCH=arm
|
|
||||||
GOARCH=arm
|
|
||||||
DUMB_ARCH=armhf
|
|
||||||
endif
|
|
||||||
ifeq ($(ARCH),arm64)
|
ifeq ($(ARCH),arm64)
|
||||||
QEMUARCH=aarch64
|
QEMUARCH=aarch64
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),ppc64le)
|
|
||||||
QEMUARCH=ppc64le
|
|
||||||
GOARCH=ppc64le
|
|
||||||
DUMB_ARCH=ppc64el
|
|
||||||
endif
|
|
||||||
ifeq ($(ARCH),s390x)
|
|
||||||
QEMUARCH=s390x
|
|
||||||
endif
|
|
||||||
|
|
||||||
TEMP_DIR := $(shell mktemp -d)
|
TEMP_DIR := $(shell mktemp -d)
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ if [ "$missing" = true ];then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v11162018-ef7143f5a
|
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v12062018-cc2b54472
|
||||||
|
|
||||||
DOCKER_OPTS=${DOCKER_OPTS:-""}
|
DOCKER_OPTS=${DOCKER_OPTS:-""}
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.70
|
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.72
|
||||||
|
|
||||||
RUN clean-install \
|
RUN clean-install \
|
||||||
g++ \
|
g++ \
|
||||||
|
|
Loading…
Reference in a new issue