diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-12-29 03:33:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-29 03:33:51 +0000 |
| commit | 93833b79940a980b0afbad068cdc40d325a8e8b5 (patch) | |
| tree | c419c8793384e3ef46bb75d7fe0ad1d605f3138a | |
| parent | ba6bd3ef221dc56a1ea2f74a1bc4d32d6fa21465 (diff) | |
| parent | 22e392b80fcf2b6b65b0c28204af8b4f080db29a (diff) | |
Merge "Update Alpine to 3.7"
| -rw-r--r-- | build.sh | 4 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docs/release/release-notes/functest-release.rst | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -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. |