Fix build and manifest.

This commit is contained in:
James Cole 2019-11-01 06:00:15 +01:00
parent 0844278eca
commit a6af263b50
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 10 additions and 44 deletions

View File

@ -18,30 +18,3 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then
docker push jc5x/firefly-iii:latest-amd64
docker push jc5x/firefly-iii:release-$VERSION-amd64
fi
# Then build ARM image (not 64 bits)
docker run --rm --privileged multiarch/qemu-user-static:register --reset
# get qemu-arm-static binary
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
if [ "$TRAVIS_BRANCH" == "develop" ]; then
echo "Build develop arm"
docker build --tag jc5x/firefly-iii:develop-arm --file Dockerfile.arm .
docker tag jc5x/firefly-iii:develop-arm jc5x/firefly-iii:develop-$VERSION-arm
docker push jc5x/firefly-iii:develop-arm
docker push jc5x/firefly-iii:develop-$VERSION-arm
fi
if [ "$TRAVIS_BRANCH" == "master" ]; then
echo "Build master 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
fi

View File

@ -1,7 +1,5 @@
#!/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

@ -2,12 +2,10 @@
if [ "$TRAVIS_BRANCH" == "develop" ]; then
TARGET=jc5x/firefly-iii:develop
ARM=jc5x/firefly-iii:develop-arm
AMD=jc5x/firefly-iii:develop-amd64
IMAGENAME=jc5x/firefly-iii:develop-$ARCH
docker manifest create $TARGET $AMD $ARM
docker manifest annotate $TARGET $ARM --arch arm --os linux
docker manifest annotate $TARGET $AMD --arch amd64 --os linux
docker manifest create $TARGET $IMAGENAME
docker manifest annotate $TARGET $IMAGENAME --arch $ARCH --os linux
docker manifest push $TARGET
fi
@ -15,21 +13,18 @@ echo "The version is $VERSION"
if [ "$TRAVIS_BRANCH" == "master" ]; then
TARGET=jc5x/firefly-iii:latest
ARM=jc5x/firefly-iii:latest-arm
AMD=jc5x/firefly-iii:latest-amd64
IMAGENAME=jc5x/firefly-iii:latest-$ARCH
docker manifest create $TARGET $AMD $ARM
docker manifest annotate $TARGET $ARM --arch arm --os linux
docker manifest annotate $TARGET $AMD --arch amd64 --os linux
docker manifest create $TARGET $IMAGENAME
docker manifest annotate $TARGET $IMAGENAME --arch $ARCH --os linux
docker manifest push $TARGET
# and another one for version specific:
TARGET=jc5x/firefly-iii:release-$VERSION
ARM=jc5x/firefly-iii:release-$VERSION-arm
AMD=jc5x/firefly-iii:release-$VERSION-amd64
IMAGENAME=jc5x/firefly-iii:release-$VERSION-$ARCH
docker manifest create $TARGET $AMD $ARM
docker manifest annotate $TARGET $ARM --arch arm --os linux
docker manifest annotate $TARGET $AMD --arch amd64 --os linux
docker manifest create $TARGET $IMAGENAME
docker manifest annotate $TARGET $IMAGENAME --arch $ARCH --os linux
docker manifest push $TARGET
fi