First triple arch build

.deploy/docker/manifest.sh

@@ -2,29 +2,42 @@
 
 if [ "$TRAVIS_BRANCH" == "develop" ]; then
     TARGET=jc5x/firefly-iii:develop
-    IMAGENAME=jc5x/firefly-iii:develop-$ARCH
 
-    docker manifest create $TARGET $IMAGENAME
+    ARM32=jc5x/firefly-iii:develop-arm
-    docker manifest annotate $TARGET $IMAGENAME --arch $ARCH --os linux
+    ARM64=jc5x/firefly-iii:develop-arm64
+    AMD64=jc5x/firefly-iii:develop-amd64
+
+    docker manifest create $TARGET $ARM32 $ARM64 $AMD64
+    docker manifest annotate $TARGET $ARM32 --arch arm   --os linux
+    docker manifest annotate $TARGET $ARM64 --arch arm64 --os linux
+    docker manifest annotate $TARGET $AMD64 --arch amd64 --os linux
     docker manifest push $TARGET
 fi
 
-echo "The version is $VERSION"
-
 if [ "$TRAVIS_BRANCH" == "master" ]; then
     TARGET=jc5x/firefly-iii:latest
-    IMAGENAME=jc5x/firefly-iii:latest-$ARCH
+
+    ARM32=jc5x/firefly-iii:latest-arm
+    ARM64=jc5x/firefly-iii:latest-arm64
+    AMD64=jc5x/firefly-iii:latest-amd64
 
 
-    docker manifest create $TARGET $IMAGENAME
+    docker manifest create $TARGET $ARM32 $ARM64 $AMD64
-    docker manifest annotate $TARGET $IMAGENAME --arch $ARCH --os linux
+    docker manifest annotate $TARGET $ARM32 --arch arm   --os linux
+    docker manifest annotate $TARGET $ARM64 --arch arm64 --os linux
+    docker manifest annotate $TARGET $AMD64 --arch amd64 --os linux
     docker manifest push $TARGET
 
     # and another one for version specific:
-    TARGET=jc5x/firefly-iii:release-$VERSION
+    VERSION_TARGET=jc5x/firefly-iii:release-$VERSION
-    IMAGENAME=jc5x/firefly-iii:release-$VERSION-$ARCH
 
-    docker manifest create $TARGET $IMAGENAME
+    VERSION_ARM32=jc5x/firefly-iii:release-$VERSION-arm
-    docker manifest annotate $TARGET $IMAGENAME --arch $ARCH --os linux
+    VERSION_ARM64=jc5x/firefly-iii:release-$VERSION-arm64
-    docker manifest push $TARGET
+    VERSION_AMD64=jc5x/firefly-iii:release-$VERSION-amd64
+
+    docker manifest create $VERSION_TARGET $VERSION_ARM32 $VERSION_ARM64 $VERSION_AMD64
+    docker manifest annotate $VERSION_TARGET $VERSION_ARM32 --arch arm   --os linux
+    docker manifest annotate $VERSION_TARGET $VERSION_ARM64 --arch arm64 --os linux
+    docker manifest annotate $VERSION_TARGET $VERSION_AMD64 --arch amd64 --os linux
+    docker manifest push $VERSION_TARGET
 fi

.deploy/docker/travis.sh

@@ -11,4 +11,3 @@ docker version
 
 # build everything
 .deploy/docker/build-$ARCH.sh
-.deploy/docker/manifest.sh

.travis.yml

@@ -15,14 +15,19 @@ jobs:
     - dist: xenial
       arch: amd64
       env: ARCH=amd64 VERSION=4.8.1.8
+      stage: build
+      script: ./.deploy/travis.sh
     - dist: xenial
       arch: amd64
       env: ARCH=arm VERSION=4.8.1.8
+      stage: build
+      script: ./.deploy/travis.sh
     - dist: xenial
       arch: arm64
       env: ARCH=arm64 VERSION=4.8.1.8
-
+      stage: build
-script:
+      script: ./.deploy/travis.sh
-  - echo $TRAVIS_DIST
+    - dist: xenial
-  - echo $ARCH
+      arch: amd64
-  - .deploy/docker/travis.sh
+      stage: manifest
+      script: ./.deploy/manifest.sh

Dockerfile.arm64

@@ -1,33 +1,4 @@
-FROM arm64v8/php:7.3-apache-stretch
+FROM jc5x/firefly-iii-base-image:latest-arm
-ENV COMPOSER_ALLOW_SUPERUSER=1
-
-# Install stuff Firefly III runs with & depends on: php extensions, locales, dev headers and composer
-RUN apt-get update && apt-get install -y locales unzip && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Script to run common extensions
-ADD https://raw.githubusercontent.com/mlocati/docker-php-extension-installer/master/install-php-extensions /usr/local/bin/
-
-RUN chmod uga+x /usr/local/bin/install-php-extensions && sync && \
-    install-php-extensions --cleanup bcmath ldap gd pdo_pgsql pdo_sqlite pdo_mysql intl opcache memcached
-
-# common config
-RUN a2enmod rewrite && a2enmod ssl && \
-	echo "el_GR.UTF-8 UTF-8\nhu_HU.UTF-8 UTF-8\nro_RO.UTF-8 UTF-8\nnb_NO.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\ncs_CZ.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen && \
-	locale-gen && \
-	curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
-	composer global require hirak/prestissimo --no-plugins --no-scripts && \
-	cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \
-    sed -i 's/max_execution_time = 30/max_execution_time = 600/' /usr/local/etc/php/php.ini && \
-    sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini
-
-# copy ca certs to correct location
-COPY ./.deploy/docker/local-build/cacert.pem /usr/local/ssl/cert.pem
-
-# copy Apache config to correct spot.
-COPY ./.deploy/docker/local-build/apache2.conf /etc/apache2/apache2.conf
-
-# Enable default site (Firefly III)
-COPY ./.deploy/docker/local-build/apache-firefly-iii.conf /etc/apache2/sites-available/000-default.conf
 
 # See also: https://github.com/JC5/firefly-iii-base-image