From aa651ed10bd491dc2d57cd31ae0c64f3914d7458 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 1 May 2020 16:21:30 +0200
Subject: Switch to arm32v6 and arm64v8 repos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I82ee83912b70d3d1d626038471f00f4332cf76aa
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 02d0e5086d7f78d4bbac284a41d3be6f2cfba9ee)
---
 .travis.yml | 2 +-
 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
diff --git a/build.sh b/build.sh
index 65e6bca4..4bad8199 100644
--- 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}" .)
-- 
cgit 1.2.3-korg