summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-01 22:18:28 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-01 22:18:28 +0200
commit01a46e85a0e1eca03f2adf7b0f479d79e71fd786 (patch)
tree1272300967740b117067c2af2a149e94b82faded
parente3794355ce80b14f02c97efbb5c2825bc3342e23 (diff)
Update to Alpine 3.8
https://alpinelinux.org/posts/Alpine-3.8.0-released.html Change-Id: Ib7384772175dd83f735d8cfbfafa1cef3fdc382c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--build.sh6
-rw-r--r--docker/core/Dockerfile2
2 files changed, 4 insertions, 4 deletions
diff --git a/build.sh b/build.sh
index 8610330f6..74f67dada 100644
--- a/build.sh
+++ b/build.sh
@@ -29,11 +29,11 @@ for dir in ${amd64_dirs}; do
(docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
done
[ ! -z "${amd64_dirs}" ] &&
- (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.7 || true)
+ (docker rmi "${repo}/functest-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-core|${repo}/functest-core:arm64-latest|g" {} +
find . -name Dockerfile -exec sed -i \
@@ -47,7 +47,7 @@ for dir in ${arm64_dirs}; do
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-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 af01347f1..ef4eb4413 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