From 02d0e5086d7f78d4bbac284a41d3be6f2cfba9ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Fri, 1 May 2020 16:21:30 +0200 Subject: [PATCH] Switch to arm32v6 and arm64v8 repos MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I82ee83912b70d3d1d626038471f00f4332cf76aa Signed-off-by: Cédric Ollivier --- .travis.yml | 2 +- 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 diff --git a/build.sh b/build.sh index c2deb5d1..8150cf3d 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.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}" .) -- 2.16.6