diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-01 22:24:15 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-01 22:24:53 +0200 |
| commit | 00ec114c0f387630dfa060bcd613baa10fd627c1 (patch) | |
| tree | 79be478fbf56da07af7fe3df33c5bfa2e96e5d7e | |
| parent | 2f66167a9cca03222b86fb464a4ca8aeeb1a3cd6 (diff) | |
Update to Alpine 3.8
https://alpinelinux.org/posts/Alpine-3.8.0-released.html
Change-Id: Ie9197f0cbc682d0c9a7cfee18b5ca6a27c466c89
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | build.sh | 6 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -28,11 +28,11 @@ for dir in ${amd64_dirs}; do done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-latest" alpine:3.7 || true) + "${repo}/functest-kubernetes-core:amd64-latest" alpine:3.8 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} + + -e "s|alpine:3.8|multiarch/alpine:arm64-v3.8|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - multiarch/alpine:arm64-v3.7 || true) + multiarch/alpine:arm64-v3.8 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 52282813..1c699c34 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.8 ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens |