From 88d65b4784e20430309109f3698242a4d1d3098e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 2 Feb 2019 19:22:03 +0100 Subject: [PATCH] Switch args around. --- .deploy/docker/build-arm.sh | 6 +++--- Dockerfile-ARM | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.deploy/docker/build-arm.sh b/.deploy/docker/build-arm.sh index 334a7d098d..dab725f547 100755 --- a/.deploy/docker/build-arm.sh +++ b/.deploy/docker/build-arm.sh @@ -15,13 +15,13 @@ echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin if [ "$TRAVIS_BRANCH" == "develop" ]; then echo "Build develop arm" - docker build --platform arm -t jc5x/firefly-iii:develop-arm -f Dockerfile-ARM . - docker push jc5x/firefly-iii:develop-arm + docker build --tag jc5x/firefly-iii:develop-arm --file Dockerfile-ARM . + docker push jc5x/firefly-iii:develop-arm --platform arm fi if [ "$TRAVIS_BRANCH" == "master" ]; then echo "Build master arm" - docker build --platform arm -t jc5x/firefly-iii:latest-arm -f Dockerfile-ARM . + docker build --platform arm --tag jc5x/firefly-iii:latest-arm --file Dockerfile-ARM . docker tag jc5x/firefly-iii:latest-arm jc5x/firefly-iii:release-$VERSION-arm docker push jc5x/firefly-iii:latest-arm docker push jc5x/firefly-iii:release-$VERSION-arm diff --git a/Dockerfile-ARM b/Dockerfile-ARM index cd01c0b9f0..3dcf94f9bf 100644 --- a/Dockerfile-ARM +++ b/Dockerfile-ARM @@ -1,4 +1,6 @@ FROM arm32v7/php:7.2.8-apache-stretch +ARG TARGETPLATFORM +RUN echo "I'm building for $TARGETPLATFORM" 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"