aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-23 19:32:43 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-28 07:28:36 +0100
commit9308174f747124c0e1e413b50046d84cb3b38cff (patch)
treec8cbf2feb3f07e19651f770fc4ddce5901b7061d
parent5b688cae66f20421ff7ff69bdfe1ca1078dcb90a (diff)
Update Alpine tag in build.sh and ansible/site.yml
It completes the previous commit updating Alpine. Change-Id: I5f29bbe9d8c79f50d3270ad76eec687073351e43 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit de031c014b89df8dad204a28f956fcace8e1091d)
-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 0782f90a..0f6cf51d 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -9,7 +9,7 @@
- repo: _
dport:
container: golang
- tag: alpine3.8
+ tag: alpine3.9
steps:
- name: build opnfv/functest-kubernetes-core
containers:
diff --git a/build.sh b/build.sh
index 7b3c4b7f..46ff4887 100644
--- a/build.sh
+++ b/build.sh
@@ -28,11 +28,11 @@ for dir in ${amd64_dirs}; do
done
[ ! -z "${amd64_dirs}" ] &&
(docker rmi \
- "${repo}/functest-kubernetes-core:amd64-latest" golang:alpine3.8 || true)
+ "${repo}/functest-kubernetes-core:amd64-latest" golang:alpine3.9 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|golang:alpine3.8|arm64v8/golang:alpine3.8|g" {} +
+ -e "s|golang:alpine3.9|arm64v8/golang:alpine3.9|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" \
- arm64v8/golang:alpine3.8 || true)
+ arm64v8/golang:alpine3.9 || true)
find . -name Dockerfile -exec git checkout {} +
exit $?