DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update e2e image (#4883)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-01-04 20:29:49 -03:00 • committed by GitHub
parent 38fae75286
commit 8fb2695d54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 95 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/e2e-image/Dockerfile
View file

@ -1,18 +1,16 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v12182019-870be3bcd AS BASE
FROM quay.io/kubernetes-ingress-controller/e2e:v01042020-d05149a70 AS BASE
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
FROM alpine:3.11
RUN clean-install \
RUN apk add -U --no-cache \
ca-certificates \
bash \
curl \
tzdata
RUN curl -Lo /usr/local/bin/kubectl \
https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/amd64/kubectl \
&& chmod +x /usr/local/bin/kubectl
tzdata \
openssl
COPY --from=BASE /go/bin/ginkgo /usr/local/bin/
COPY --from=BASE /usr/local/bin/kubectl /usr/local/bin/
COPY e2e.sh /e2e.sh
COPY cloud-generic /cloud-generic

4
test/e2e-image/Makefile
View file

@ -1,9 +1,11 @@
.PHONY: all
all: container
DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
.PHONY: container
container:
make -C ../../ e2e-test-binary
${DIR}/../../build/run-in-docker.sh make e2e-test-binary
cp ../e2e/e2e.test .
cp ../e2e/wait-for-nginx.sh .