diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2020-05-01 15:25:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-05-01 15:25:13 +0000 |
| commit | 69a2e39d64eb93e7587d35fbc1cd4c62fa702b5b (patch) | |
| tree | a198a6420c5c35c144c0c35cc979de3f3628a7fd | |
| parent | 36397b9f974714c2680b2b883902cca871894dd5 (diff) | |
| parent | 02d0e5086d7f78d4bbac284a41d3be6f2cfba9ee (diff) | |
Merge "Switch to arm32v6 and arm64v8 repos" into stable/jerma
| -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 0311d2f9..bf0c220a 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.7 python3.7-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.10|multiarch/alpine:arm64-v3.10|g" {} + + -e "s|alpine:3.10|arm64v8/alpine:3.10|g" {} + elif [[ ${arch} == arm ]]; then 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" {} + fi (cd docker && docker build "${build_opts[@]}" \ -t "${repo}/${image}:${arch}-${tag}" .) |