From 68956eabf24f794052ed07ab608a88cb8351593a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 2 Feb 2019 17:08:46 +0100 Subject: [PATCH] Refer to ARM script. --- .deploy/docker/build-arm.sh | 23 +++++++++++++++++++++++ .travis.yml | 16 ++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 .deploy/docker/build-arm.sh diff --git a/.deploy/docker/build-arm.sh b/.deploy/docker/build-arm.sh new file mode 100644 index 0000000000..9a702f3e76 --- /dev/null +++ b/.deploy/docker/build-arm.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +docker run --rm --privileged multiarch/qemu-user-static:register --reset + +# get qemu-arm-static binary +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 + +# build image +docker build -t jc5x/ff-test-builds:develop -f Dockerfile-ARM . +echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + +if [ "$TRAVIS_BRANCH" == "develop" ]; then + docker push jc5x/firefly-iii:develop-arm +fi + +if [ "$TRAVIS_BRANCH" == "master" ]; then + docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" + docker push jc5x/firefly-iii:latest-arm + docker push jc5x/firefly-iii:release-$VERSION-arm +fi \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 4840718785..cd7136ad47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,19 +6,11 @@ branches: - develop - master +env: + - VERSION=4.7.10 + services: - docker script: - - docker run --rm --privileged multiarch/qemu-user-static:register --reset - # get qemu-arm-static binary - - 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 - # build image - - docker build -t jc5x/ff-test-builds:develop -f Dockerfile-ARM . - - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - docker push jc5x/ff-test-builds \ No newline at end of file + - .deploy/docker/build-arm.sh \ No newline at end of file