IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Switch args around.

Browse Source
This commit is contained in:
James Cole 2019-02-02 19:22:03 +01:00
parent 6db869de23
commit 88d65b4784
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.deploy/docker/build-arm.sh
View File

@ -15,13 +15,13 @@ echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
if [ "$TRAVIS_BRANCH" == "develop" ]; then if [ "$TRAVIS_BRANCH" == "develop" ]; then
echo "Build develop arm" echo "Build develop arm"
docker build --platform arm -t jc5x/firefly-iii:develop-arm -f Dockerfile-ARM . docker build --tag jc5x/firefly-iii:develop-arm --file Dockerfile-ARM .
docker push jc5x/firefly-iii:develop-arm docker push jc5x/firefly-iii:develop-arm --platform arm
fi fi
if [ "$TRAVIS_BRANCH" == "master" ]; then if [ "$TRAVIS_BRANCH" == "master" ]; then
echo "Build master arm" 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 tag jc5x/firefly-iii:latest-arm jc5x/firefly-iii:release-$VERSION-arm
docker push jc5x/firefly-iii:latest-arm docker push jc5x/firefly-iii:latest-arm
docker push jc5x/firefly-iii:release-$VERSION-arm docker push jc5x/firefly-iii:release-$VERSION-arm

2
Dockerfile-ARM
View File

@ -1,4 +1,6 @@
FROM arm32v7/php:7.2.8-apache-stretch 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 COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static
ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
LABEL version="1.3" maintainer="thegrumpydictator@gmail.com" LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"