diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-05-01 16:21:30 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-05-01 16:23:06 +0200 |
| commit | 97494cc49d853e4294b38d121ee112920e6e85ba (patch) | |
| tree | 3b6e57cb4fdb261e178b54a5df980442fd499a55 | |
| parent | 21ee2d757c0835f3fdeef8da4b3f3ec298cf6e8c (diff) | |
Switch to arm32v6 and arm64v8 repos
Change-Id: I82ee83912b70d3d1d626038471f00f4332cf76aa
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 02d0e5086d7f78d4bbac284a41d3be6f2cfba9ee)
| -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 78b54c43..cf430bd1 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}" .) |