From ccf60f4cdcdc290e9367864c318348f4239399b4 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 10 Feb 2019 08:07:25 +0100
Subject: [PATCH] Back to classic build.

---
 .deploy/docker/build-amd64.sh   |  4 ++--
 .deploy/docker/build-arm.sh     |  4 ++--
 .deploy/docker/build-generic.sh | 28 ----------------------------
 .travis.yml                     | 13 ++++++-------
 4 files changed, 10 insertions(+), 39 deletions(-)
 delete mode 100755 .deploy/docker/build-generic.sh

diff --git a/.deploy/docker/build-amd64.sh b/.deploy/docker/build-amd64.sh
index 4a80ab83b2..b3cfcb13f5 100755
--- a/.deploy/docker/build-amd64.sh
+++ b/.deploy/docker/build-amd64.sh
@@ -5,13 +5,13 @@ echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
 if [ "$TRAVIS_BRANCH" == "develop" ]; then
     echo "Build develop amd64"
-    docker build -t jc5x/firefly-iii:develop-amd -f Dockerfile .
+    docker build -t jc5x/firefly-iii:develop-amd -f Dockerfile.amd64 .
     docker push jc5x/firefly-iii:develop-amd
 fi
 
 if [ "$TRAVIS_BRANCH" == "master" ]; then
     echo "Build master amd64"
-    docker build -t jc5x/firefly-iii:latest-amd -f Dockerfile .
+    docker build -t jc5x/firefly-iii:latest-amd -f Dockerfile.amd64 .
     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
diff --git a/.deploy/docker/build-arm.sh b/.deploy/docker/build-arm.sh
index 5e2df5c204..893076a747 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 --tag jc5x/firefly-iii:develop-arm --file Dockerfile-ARM .
+    docker build --tag jc5x/firefly-iii:develop-arm --file Dockerfile.arm .
     docker push jc5x/firefly-iii:develop-arm
 fi
 
 if [ "$TRAVIS_BRANCH" == "master" ]; then
     echo "Build master arm"
-    docker build --tag jc5x/firefly-iii:latest-arm --file Dockerfile-ARM .
+    docker build --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/.deploy/docker/build-generic.sh b/.deploy/docker/build-generic.sh
deleted file mode 100755
index ede14570c8..0000000000
--- a/.deploy/docker/build-generic.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# build image
-echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-
-# get qemu-arm-static binary
-if [ "$TRAVIS_BRANCH" == "arm" ]; 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"
-    docker build -t jc5x/firefly-iii:develop-$ARCH -f Dockerfile.$ARCH .
-    docker push jc5x/firefly-iii:develop-$ARCH
-fi
-
-if [ "$TRAVIS_BRANCH" == "master" ]; then
-    echo "Build master $ARCH"
-    docker build -t jc5x/firefly-iii:latest-$ARCH -f Dockerfile.$ARCH .
-    docker tag jc5x/firefly-iii:latest-$ARCH jc5x/firefly-iii:release-$VERSION-$ARCH
-    docker push jc5x/firefly-iii:latest-$ARCH
-    docker push jc5x/firefly-iii:release-$VERSION-$ARCH
-fi
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 730eb79b79..f43c7ef671 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,10 @@
 sudo: required
+language: bash
 env:
-  global:
-    - VERSION=4.7.11
-  matrix:
-    - ARCH=arm
-    #- ARCH=arm64
-    - ARCH=amd64
+  - VERSION=4.7.11
 
 dist: xenial
+
 # safelist
 branches:
   only:
@@ -23,5 +20,7 @@ script:
   - sudo service docker restart
   - docker version -f '{{.Server.Experimental}}'
   - docker version
-  - .deploy/docker/build-generic.sh
+  # build everything
+  - .deploy/docker/build-amd64.sh
+  - .deploy/docker/build-arm.sh
   - .deploy/docker/manifest.sh