diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-23 19:32:43 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-23 19:55:58 +0100 |
| commit | 47e68332637d9b72888c79201b41ea424ac35a22 (patch) | |
| tree | 76323c4dff59f13b5841a5f72f9031d07022eff8 | |
| parent | 11b4d680022679bcbc7991bfa56b0651f63d4ffc (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.yml | 2 | ||||
| -rw-r--r-- | build.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ansible/site.yml b/ansible/site.yml index 3a894a4b..3307b386 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -12,7 +12,7 @@ - repo: _ dport: container: golang - tag: alpine3.8 + tag: 1.11.6-alpine3.9 steps: - name: build opnfv/functest-kubernetes-core containers: @@ -28,11 +28,11 @@ for dir in ${amd64_dirs}; do done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-hunter" golang:1.11.1-alpine3.8 || true) + "${repo}/functest-kubernetes-core:amd64-hunter" golang:1.11.6-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.11.1-alpine3.8|arm64v8/golang:1.11.1-alpine3.8|g" {} + + -e "s|golang:1.11.6-alpine3.9|arm64v8/golang:1.11.6-alpine3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm64-hunter|g" {} + @@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \ - arm64v8/golang:1.11.1-alpine3.8 || true) + arm64v8/golang:1.11.6-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? |