diff --git a/Makefile b/Makefile index 2337af28d..d1ab27075 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,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.80 +BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.81 ifeq ($(ARCH),arm64) QEMUARCH=aarch64 diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh index e1092c469..2a0130144 100755 --- 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:v02262019-ec3a2d6bc +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03012019-1ad00f305 DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 3ab44be50..68bf9577c 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.80 +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.81 RUN clean-install \ g++ \ @@ -25,9 +25,9 @@ RUN clean-install \ python \ pkg-config -ENV GOLANG_VERSION 1.11.5 +ENV GOLANG_VERSION 1.12 ENV GO_ARCH linux-amd64 -ENV GOLANG_SHA ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25 +ENV GOLANG_SHA 750a07fef8579ae4839458701f4df690e0b20b8bcce33b437e4df89c451b6f13 RUN set -eux; \ url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \ @@ -45,8 +45,9 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" WORKDIR $GOPATH -ENV RESTY_CLI_VERSION 0.22rc2 -ENV RESTY_CLI_SHA 1ec64d204469a04da553c95eaafb2e5601a03acb8f26cc10ae16b15525228c12 +ENV RESTY_CLI_VERSION 0.23 +ENV RESTY_CLI_SHA 8715b9a6e33140fd468779cd561c0c622f7444a902dc578b1137941ff3fc1ed8 + RUN set -eux; \ url="https://github.com/openresty/resty-cli/archive/v${RESTY_CLI_VERSION}.tar.gz"; \ wget -O resty_cli.tgz "$url"; \ @@ -57,7 +58,7 @@ RUN set -eux; \ resty -V RUN luarocks install luacheck \ - && luarocks install busted 2.0.rc12 + && luarocks install busted RUN go get github.com/onsi/ginkgo/ginkgo \ && go get golang.org/x/lint/golint diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index 5d8ec332b..b8c13cbde 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/kubernetes-ingress-controller/e2e:v02262019-ec3a2d6bc AS BASE +FROM quay.io/kubernetes-ingress-controller/e2e:v03012019-1ad00f305 AS BASE FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1