From 4f82cdd4ddef7a5457372bd57736ebda17cd7fb0 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 4 Jan 2020 22:10:48 +0100 Subject: Update Alpine to 3.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also updates Python to 3.8 (default version). https://alpinelinux.org/posts/Alpine-3.11.0-released.html Change-Id: I3bbfdb76d2fb71f9a426e4fe7dacace0917e2070 Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 4 ++-- docker/healthcheck/Dockerfile | 2 +- docker/smoke/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index e243f25b..96df5742 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13-alpine3.10 +FROM golang:1.13-alpine3.11 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -22,5 +22,5 @@ RUN apk --no-cache add --update python3 bash git grep libffi openssl mailcap && printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ apk del .build-deps -COPY logging.ini /usr/lib/python3.7/site-packages/xtesting/ci/logging.ini +COPY logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.ini CMD ["run_tests", "-t", "all"] diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 9b751d73..1467f857 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -16,5 +16,5 @@ RUN apk --no-cache add --update make bash git \ mv _output/bin/* /usr/local/bin) && \ rm -r /src/k8s.io && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 72318e7c..72ad2e6e 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ FROM opnfv/functest-kubernetes-healthcheck -COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] -- cgit 1.2.3-korg