aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-23 16:03:59 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-24 09:30:15 +0100
commitf0df89ccda64f76798d618517bc00a29c1f74bb1 (patch)
tree99fbb0ca0da5f3c4174dabea586518713f3c98be
parent88fab28354f8baec0e7bd6fcbb62f92b6de5c63d (diff)
Update Alpine tag in ansible/site.yml and build.sh
It complete the previous commit updating Alpine [1]. [1] https://git.opnfv.org/functest/commit/docker/core/Dockerfile?id=ee700ae5c7ab1fa3e761c330686f89f3ddefbfd3 Change-Id: Icec39d36c661ba3eb3e79c9abb592897f46efa22 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 43d4ce6bd5d0778fb51b014d33a04afafa6a18bb)
-rw-r--r--ansible/site.yml2
-rw-r--r--build.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/ansible/site.yml b/ansible/site.yml
index f903eee74..48cdc3c85 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -13,7 +13,7 @@
- repo: _
dport:
container: alpine
- tag: 3.8
+ tag: 3.9
steps:
- name: build opnfv/functest-core
containers:
diff --git a/build.sh b/build.sh
index 6f93ae3df..535dc1a47 100644
--- a/build.sh
+++ b/build.sh
@@ -27,11 +27,11 @@ for dir in ${amd64_dirs}; do
(docker rmi "${repo}/functest-${dir##**/}:amd64-hunter" || true)
done
[ ! -z "${amd64_dirs}" ] &&
- (docker rmi "${repo}/functest-core:amd64-hunter" alpine:3.8 || true)
+ (docker rmi "${repo}/functest-core:amd64-hunter" alpine:3.9 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|alpine:3.8|multiarch/alpine:arm64-v3.8|g" {} +
+ -e "s|alpine:3.9|multiarch/alpine:arm64-v3.9|g" {} +
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core:hunter|${repo}/functest-core:arm64-hunter|g" {} +
find . -name Dockerfile -exec sed -i \
@@ -45,7 +45,7 @@ for dir in ${arm64_dirs}; do
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-core:arm64-hunter" \
- multiarch/alpine:arm64-v3.8 || true)
+ multiarch/alpine:arm64-v3.9 || true)
find . -name Dockerfile -exec git checkout {} +
exit $?