Update e2e image
This commit is contained in:
parent
68bfbd939b
commit
02c99e9ccf
5 changed files with 10 additions and 6 deletions
|
@ -34,7 +34,7 @@ function cleanup {
|
|||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01142020-3f0df1c35
|
||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01262020-44fb2a873
|
||||
|
||||
DOCKER_OPTS=${DOCKER_OPTS:-}
|
||||
|
||||
|
|
|
@ -38,6 +38,7 @@ RUN apk add --no-cache \
|
|||
gcc \
|
||||
git \
|
||||
musl-dev \
|
||||
perl \
|
||||
python \
|
||||
openssl
|
||||
|
||||
|
@ -47,7 +48,6 @@ RUN set -eux; \
|
|||
pkgconfig \
|
||||
openssl \
|
||||
unzip \
|
||||
perl \
|
||||
go \
|
||||
; \
|
||||
export \
|
||||
|
|
|
@ -23,10 +23,11 @@ docker-build:
|
|||
docker buildx build \
|
||||
--pull \
|
||||
--load \
|
||||
--progress plain \
|
||||
--build-arg K8S_RELEASE=v1.15.7 \
|
||||
--build-arg ETCD_VERSION=v3.3.18 \
|
||||
--build-arg GOLANG_VERSION=1.13.5 \
|
||||
--build-arg GOLANG_SHA=27d356e2a0b30d9983b60a788cf225da5f914066b37a6b4f69d457ba55a626ff \
|
||||
--build-arg GOLANG_VERSION=1.13.6 \
|
||||
--build-arg GOLANG_SHA=aae5be954bdc40bcf8006eb77e8d8a5dde412722bc8effcdaf9772620d06420c \
|
||||
--build-arg RESTY_CLI_VERSION=0.25rc2 \
|
||||
--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \
|
||||
-t $(IMAGE):$(TAG) .
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM quay.io/kubernetes-ingress-controller/e2e:v01142020-3f0df1c35 AS BASE
|
||||
FROM quay.io/kubernetes-ingress-controller/e2e:v01262020-44fb2a873 AS BASE
|
||||
|
||||
FROM alpine:3.11
|
||||
|
||||
|
|
|
@ -25,7 +25,10 @@ endif
|
|||
cp -r ../../deploy/cloud-generic .
|
||||
cp -r ../../deploy/cluster-wide .
|
||||
|
||||
docker build -t nginx-ingress-controller:e2e .
|
||||
docker buildx build \
|
||||
--load \
|
||||
--progress plain \
|
||||
--tag nginx-ingress-controller:e2e .
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
|
|
Loading…
Reference in a new issue