X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=docker%2Fk8s%2FDockerfile;h=3296fdfb974789fdfb0dff3af452752f4e853f25;hp=925ac3d6c986f34a7bda3c0933b5b61d8937b812;hb=0df3673f2d2e9354956cf812d073e595f1d97903;hpb=d3d0fcef938f79ab15f30ec5dda25ffae9ae6e9b diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile index 925ac3d..3296fdf 100644 --- a/docker/k8s/Dockerfile +++ b/docker/k8s/Dockerfile @@ -15,13 +15,13 @@ ############################################################################## # ref: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#use-multi-stage-builds -FROM golang:alpine3.9 as build +FROM golang:alpine3.10 as build # Sonobuoy supports 3 Kubernetes minor versions: the current release and 2 # minor versions before. -ARG SB_TAG=v0.15.1 +ARG SB_TAG=v0.16.1 # Determine the latest stable git tag at build time based on stable major version -ARG K8S_VER=1.15 +ARG K8S_VER=1.16 # Install dependencies COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt @@ -53,7 +53,7 @@ RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; https://storage.googleapis.com/kubernetes-release/release/stable-$K8S_VER.txt) && \ make kubectl ginkgo && \ make WHAT=test/e2e/e2e.test ARCH=$HOST_ARCH -RUN go get -d github.com/heptio/sonobuoy && \ +RUN git clone https://github.com/heptio/sonobuoy /go/src/github.com/heptio/sonobuoy && \ cd /go/src/github.com/heptio/sonobuoy && \ git checkout $SB_TAG && \ go install @@ -65,8 +65,8 @@ WORKDIR /wheels RUN pip3 install wheel RUN pip3 wheel -r /wheels/requirements/pip-requirements.txt -# Copy binaries in the final contaier and install robot framework -FROM python:3.6-alpine3.9 +# Copy binaries in the final container and install robot framework +FROM python:3.7-alpine3.10 COPY --from=build /src/k8s.io/kubernetes/_output/bin /usr/local/bin COPY --from=build /go/bin/sonobuoy /bin/sonobuoy COPY --from=build /wheels /wheels