From 22e392b80fcf2b6b65b0c28204af8b4f080db29a Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 28 Dec 2017 15:16:48 +0100 Subject: Update Alpine to 3.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It conforms with the last release [1] and Docker latest [2]. [1] https://alpinelinux.org/posts/Alpine-3.7.0-released.html [2] https://hub.docker.com/_/alpine/ Change-Id: I731b455bd9eb9900c7794643b8605bf73a15726d Signed-off-by: Cédric Ollivier --- build.sh | 4 ++-- docker/core/Dockerfile | 2 +- docs/release/release-notes/functest-release.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index d1c964bdc..99a9b466f 100644 --- a/build.sh +++ b/build.sh @@ -22,10 +22,10 @@ for dir in ${amd64_dirs}; do docker push "${repo}/functest-${dir##**/}:amd64-latest" [ "${dir}" != "docker/core" ] && (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true) done -[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.6 || true) +[ ! -z "${amd64_dirs}" ] && (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.7 || true) find . -name Dockerfile -exec git checkout {} + -find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:arm64-v3.6|g" {} + +find . -name Dockerfile -exec sed -i -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} + find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:arm64-latest" .) diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 540746649..bc47e39b0 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 ARG BRANCH=master ARG OPENSTACK_TAG=stable/pike diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst index bbf3021a2..78ec8f227 100644 --- a/docs/release/release-notes/functest-release.rst +++ b/docs/release/release-notes/functest-release.rst @@ -120,7 +120,7 @@ Documents Version change ============== -Functest now delivers light-weigth Docker images based on Alpine 3.6. The test cases are grouped into several categories +Functest now delivers light-weigth Docker images based on Alpine 3.7. The test cases are grouped into several categories or tiers and must be run from the corresponding container. For example, to run the test case healthcheck, the image opnfv/functest-healthcheck shall be used. The tiers and the tests within them are explained in detail in the User Guide. -- cgit 1.2.3-korg