kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-02 19:16:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix build and manifest.

Browse Source
This commit is contained in:
James Cole
2019-11-01 06:00:15 +01:00
parent 0844278eca
commit a6af263b50
3 changed files with 10 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.deploy/docker/build-amd64.sh
View File

@@ -18,30 +18,3 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then
docker push jc5x/firefly-iii:latest-amd64 docker push jc5x/firefly-iii:latest-amd64
docker push jc5x/firefly-iii:release-$VERSION-amd64 docker push jc5x/firefly-iii:release-$VERSION-amd64
fi 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

2
.deploy/docker/build-arm.sh
View File

@@ -1,7 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# file is currently unused.
docker run --rm --privileged multiarch/qemu-user-static:register --reset docker run --rm --privileged multiarch/qemu-user-static:register --reset
# get qemu-arm-static binary # get qemu-arm-static binary

25
.deploy/docker/manifest.sh
View File

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