diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2020-08-06 09:07:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-08-06 09:07:59 +0000 |
| commit | b5b2a7a3bc46956ed8c210c7fed99014a85763cd (patch) | |
| tree | e366019ee3bf5071edfa49558c6da93b90e3d9bb /build.sh | |
| parent | 982ec6816ccf3b96eda0fa7247841998c55afba2 (diff) | |
| parent | 075e4821dbbb6ac49b25161935a93b957fcd389a (diff) | |
Merge "Use alpine edge for py3-distlib only"
Diffstat (limited to 'build.sh')
| -rw-r--r-- | build.sh | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -34,11 +34,11 @@ for dir in ${amd64_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true) done [ -n "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-latest" alpine:edge || true) + (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.12 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:edge|arm64v8/alpine:edge|g" {} + + -e "s|alpine:3.12|arm64v8/alpine:3.12|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} + find . -name Dockerfile -exec sed -i \ @@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do done [ -n "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" \ - arm64v8/alpine:edge || true) + arm64v8/alpine:3.12 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:edge|arm32v6/alpine:edge|g" {} + + -e "s|alpine:3.12|arm32v6/alpine:3.12|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} + find . -name Dockerfile -exec sed -i \ @@ -70,7 +70,7 @@ for dir in ${arm_dirs}; do done [ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-latest" \ - arm32v6/alpine:edge || true) + arm32v6/alpine:3.12 || true) find . -name Dockerfile -exec git checkout {} + exit $? |