mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-12 01:42:32 +00:00
Fix build and manifest.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user