diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-05-01 16:04:26 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-05-01 16:04:26 +0200 |
| commit | 29cfe2a019663911e7ca5b2fee637e3bf494e1d6 (patch) | |
| tree | c59d919b3daab33d3f4ac0699d6a0b224121a982 /build.sh | |
| parent | a0b58f45e42adc3eee61cf392328345b4df78d30 (diff) | |
Use official images instead of multiarch
Change-Id: I5031a19691966f1a5d63dc7dbd9c3254beed9a03
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'build.sh')
| -rw-r--r-- | build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -40,7 +40,7 @@ done find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.10|multiarch/alpine:arm64-v3.10|g" {} + + -e "s|alpine:3.10|arm64v8/alpine:3.10|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:jerma|${repo}/functest-core:arm64-jerma|g" {} + find . -name Dockerfile -exec sed -i \ @@ -56,11 +56,11 @@ for dir in ${arm64_dirs}; do done [ -n "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-jerma" \ - multiarch/alpine:arm64-v3.10 || true) + arm64v8/alpine:3.10 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.10|multiarch/alpine:armhf-v3.10|g" {} + + -e "s|alpine:3.10|arm32v6/alpine:3.10|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:jerma|${repo}/functest-core:arm-jerma|g" {} + find . -name Dockerfile -exec sed -i \ @@ -76,7 +76,7 @@ for dir in ${arm_dirs}; do done [ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-jerma" \ - multiarch/alpine:armhf-v3.10 || true) + arm32v6/alpine:3.10 || true) find . -name Dockerfile -exec git checkout {} + exit $? |