From 21ddbd220ab6101263341150bdb912aed5be04a6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 8 Feb 2019 17:40:29 +0100 Subject: [PATCH] Include lib for arm --- .deploy/docker/build-generic.sh | 9 +++++++++ Dockerfile.arm | 2 +- Dockerfile.arm64 | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.deploy/docker/build-generic.sh b/.deploy/docker/build-generic.sh index 5d148784bd..83cd672e2c 100755 --- a/.deploy/docker/build-generic.sh +++ b/.deploy/docker/build-generic.sh @@ -3,6 +3,15 @@ # build image echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin +# get qemu-arm-static binary +if [ "$TRAVIS_BRANCH" != "amd64" ]; then + mkdir tmp + pushd tmp && \ + curl -L -o qemu-arm-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v2.6.0/qemu-arm-static.tar.gz && \ + tar xzf qemu-arm-static.tar.gz && \ + popd +fi + # build develop if [ "$TRAVIS_BRANCH" == "develop" ]; then echo "Build develop $ARCH" diff --git a/Dockerfile.arm b/Dockerfile.arm index 10a3e1c91a..cfe6e0ad31 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,6 +1,6 @@ FROM arm32v7/php:7.2.8-apache-stretch ARG TARGETPLATFORM -#COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static +COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1 LABEL version="1.3" maintainer="thegrumpydictator@gmail.com" diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 10a3e1c91a..cfe6e0ad31 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,6 +1,6 @@ FROM arm32v7/php:7.2.8-apache-stretch ARG TARGETPLATFORM -#COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static +COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1 LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"