Switch to arm32v6 and arm64v8 repos 13/70113/1
authorCédric Ollivier <cedric.ollivier@orange.com>
Fri, 1 May 2020 14:21:30 +0000 (16:21 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Fri, 1 May 2020 14:23:06 +0000 (16:23 +0200)
Change-Id: I82ee83912b70d3d1d626038471f00f4332cf76aa
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 02d0e5086d7f78d4bbac284a41d3be6f2cfba9ee)

.travis.yml
build.sh

index 78b54c4..cf430bd 100644 (file)
@@ -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
index ee727fa..4858721 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -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}" .)