Update k8s layer base container image 45/2245/1
authorJuha Kosonen <juha.kosonen@nokia.com>
Thu, 20 Feb 2020 10:29:27 +0000 (12:29 +0200)
committerJuha Kosonen <juha.kosonen@nokia.com>
Thu, 20 Feb 2020 10:32:44 +0000 (12:32 +0200)
Starting from v1.16.5 building e2e test requires Go 1.13.4 or
greater. Layer image updated followingly:

Go 1.12.9 -> 1.13.8
Python 3.6.10 -> 3.7.6

JIRA: VAL-99

Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Change-Id: I551b573fce9e461d9523f07056cea4ae6be854dc

docker/k8s/Dockerfile

index 43c6d80..3296fdf 100644 (file)
@@ -15,7 +15,7 @@
 ##############################################################################
 
 # 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.
@@ -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