From de031c014b89df8dad204a28f956fcace8e1091d Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 23 Mar 2019 19:32:43 +0100 Subject: Update Alpine tag in build.sh and ansible/site.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It completes the previous commit updating Alpine. Change-Id: I5f29bbe9d8c79f50d3270ad76eec687073351e43 Signed-off-by: Cédric Ollivier --- ansible/site.yml | 2 +- build.sh | 6 +++--- 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 $? -- cgit 1.2.3-korg