From d0d7c437f2905050026b8afbbbec81ae5dffd39b Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 8 Feb 2019 17:15:54 +0100 Subject: [PATCH] Different build flow. --- .deploy/docker/build-generic.sh | 20 ++++++++++++++++++++ .travis.yml | 14 ++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) create mode 100755 .deploy/docker/build-generic.sh diff --git a/.deploy/docker/build-generic.sh b/.deploy/docker/build-generic.sh new file mode 100755 index 0000000000..e72e769973 --- /dev/null +++ b/.deploy/docker/build-generic.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# build image +echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + +# build develop +if [ "$TRAVIS_BRANCH" == "develop" ]; then + echo "Build develop $ARCH" + #docker build -t whoami --build-arg "arch=$ARCH" . + #docker build -t jc5x/firefly-iii:develop -f Dockerfile --build-arg "arch=$env:ARCH" . + #docker push jc5x/firefly-iii:develop +fi + +#if [ "$TRAVIS_BRANCH" == "master" ]; then +# echo "Build master amd64" +# docker build -t jc5x/firefly-iii:latest-amd -f Dockerfile . +# docker tag jc5x/firefly-iii:latest-amd jc5x/firefly-iii:release-$VERSION-amd +# docker push jc5x/firefly-iii:latest-amd +# docker push jc5x/firefly-iii:release-$VERSION-amd +#fi \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 5ebaaaf8ab..3b99f0ad5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,11 @@ sudo: required -language: bash +env: + - VERSION=4.7.10 + matrix: + - ARCH=arm + - ARCH=arm64 + - ARCH=amd64 + dist: xenial # safelist branches: @@ -7,9 +13,6 @@ branches: - develop - master -env: - - VERSION=4.7.10 - services: - docker @@ -19,6 +22,5 @@ script: - sudo service docker restart - docker version -f '{{.Server.Experimental}}' - docker version - - .deploy/docker/build-amd64.sh - - .deploy/docker/build-arm.sh + - .deploy/docker/build-generic.sh - .deploy/docker/manifest.sh \ No newline at end of file