From 1b63bfc3dbda3c8de3d6e21b1c7394e01948568d Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 1 Nov 2019 05:56:19 +0100
Subject: [PATCH] Use central docker script.

---
 .deploy/docker/build-amd64.sh | 3 ---
 .deploy/docker/build-arm.sh   | 2 ++
 .deploy/docker/travis.sh      | 3 +--
 .travis.yml                   | 6 ++----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.deploy/docker/build-amd64.sh b/.deploy/docker/build-amd64.sh
index c14c6472b2..f00a2c12d2 100755
--- a/.deploy/docker/build-amd64.sh
+++ b/.deploy/docker/build-amd64.sh
@@ -30,9 +30,6 @@ curl -L -o qemu-arm-static.tar.gz https://github.com/multiarch/qemu-user-static/
 tar xzf qemu-arm-static.tar.gz && \
 popd
 
-# build image
-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 .
diff --git a/.deploy/docker/build-arm.sh b/.deploy/docker/build-arm.sh
index 4ea42d38e9..75206eddc8 100755
--- a/.deploy/docker/build-arm.sh
+++ b/.deploy/docker/build-arm.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# file is currently unused.
+
 docker run --rm --privileged multiarch/qemu-user-static:register --reset
 
 # get qemu-arm-static binary
diff --git a/.deploy/docker/travis.sh b/.deploy/docker/travis.sh
index c96250135e..f98f25443a 100755
--- a/.deploy/docker/travis.sh
+++ b/.deploy/docker/travis.sh
@@ -10,6 +10,5 @@ docker version -f '{{.Server.Experimental}}'
 docker version
 
 # build everything
-.deploy/docker/build-amd64.sh
-.deploy/docker/build-arm.sh
+.deploy/docker/build-$ARCH.sh
 .deploy/docker/manifest.sh
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 70988e0de3..6f835d963d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,9 +20,7 @@ jobs:
       env: ARCH=arm64 VERSION=4.8.1.8
 
 script:
-  # - .deploy/docker/travis.sh
+  - .deploy/docker/travis.sh
   # enable experimental features.
   - echo $TRAVIS_DIST
-  - echo $ARCH_VERS
-  - .deploy/docker/build-$ARCH.sh
-  - docker build -t jc5x/firefly-iii:develop-arm64 -f Dockerfile.arm64 .
\ No newline at end of file
+  - echo $ARCH