Use central docker script.

This commit is contained in:
James Cole 2019-11-01 05:56:19 +01:00
parent a4906a2d21
commit 1b63bfc3db
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 5 additions and 9 deletions

View File

@ -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 .

View File

@ -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

View File

@ -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

View File

@ -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 .
- echo $ARCH