diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh index cf4c21ecb..64b002cdc 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:v01092019-b433108ea +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v02132019-7dc17a603 DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 13accbf59..8501d20a0 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.75 +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.76 RUN clean-install \ g++ \ @@ -25,9 +25,9 @@ RUN clean-install \ python \ pkg-config -ENV GOLANG_VERSION 1.11.4 +ENV GOLANG_VERSION 1.11.5 ENV GO_ARCH linux-amd64 -ENV GOLANG_SHA fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b +ENV GOLANG_SHA ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25 RUN set -eux; \ url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \ @@ -62,5 +62,5 @@ RUN luarocks install luacheck \ RUN go get github.com/onsi/ginkgo/ginkgo \ && go get golang.org/x/lint/golint -RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.12.4/bin/linux/amd64/kubectl \ +RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/linux/amd64/kubectl \ && chmod +x /usr/local/bin/kubectl