diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2020-05-01 15:22:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-05-01 15:22:52 +0000 |
| commit | 67df0ae59ce7be87cee1386b579532a50924741d (patch) | |
| tree | 85d6fd51970c684dda3ae303a56c85c4e154174b | |
| parent | 954fa9e943468477d7b6a60af29a253e6da7dd97 (diff) | |
| parent | aa651ed10bd491dc2d57cd31ae0c64f3914d7458 (diff) | |
Merge "Switch to arm32v6 and arm64v8 repos" into stable/hunter
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | build.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 08d89174..3aca6bc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ addons: - libssl1.0.0 before_script: - - sudo apt-get -y install qemu-user-static + - sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - sudo add-apt-repository -y ppa:deadsnakes/ppa - sudo apt-get update - sudo apt-get install python3.6 python3.6-dev @@ -19,10 +19,10 @@ build_opts=(--pull=true --no-cache --force-rm=true) for arch in ${arch};do if [[ ${arch} == arm64 ]]; then find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.9|multiarch/alpine:arm64-v3.9|g" {} + + -e "s|alpine:3.9|arm64v8/alpine:3.9|g" {} + elif [[ ${arch} == arm ]]; then find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.9|multiarch/alpine:armhf-v3.9|g" {} + + -e "s|alpine:3.9|arm32v6/alpine:3.9|g" {} + fi (cd docker && docker build "${build_opts[@]}" \ -t "${repo}/${image}:${arch}-${tag}" .) |