Back to classic build.

firefly-iii · Feb 10, 2019 · ccf60f4 · ccf60f4
1 parent c5af1d3
commit ccf60f4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 39 deletions.
diff --git 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
@@ -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
diff --git 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