kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 09:52:20 +00:00
Code Issues Projects Releases Wiki Activity

Mention amd specifically.

Browse Source
This commit is contained in:
James Cole
2019-02-03 09:05:40 +01:00
parent bbbaf6c868
commit d13b9a0cc3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,14 +5,14 @@ echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
if [ "$TRAVIS_BRANCH" == "develop" ]; then if [ "$TRAVIS_BRANCH" == "develop" ]; then
echo "Build develop amd64" echo "Build develop amd64"
docker build -t jc5x/firefly-iii:develop -f Dockerfile . docker build -t jc5x/firefly-iii:develop-amd -f Dockerfile .
docker push jc5x/firefly-iii:develop docker push jc5x/firefly-iii:develop-amd
fi fi
if [ "$TRAVIS_BRANCH" == "master" ]; then if [ "$TRAVIS_BRANCH" == "master" ]; then
echo "Build master amd64" echo "Build master amd64"
docker build -t jc5x/firefly-iii:latest -f Dockerfile . docker build -t jc5x/firefly-iii:latest-amd -f Dockerfile .
docker tag jc5x/firefly-iii:latest jc5x/firefly-iii:release-$VERSION docker tag jc5x/firefly-iii:latest-amd jc5x/firefly-iii:release-$VERSION-amd
docker push jc5x/firefly-iii:latest docker push jc5x/firefly-iii:latest-amd
docker push jc5x/firefly-iii:release-$VERSION docker push jc5x/firefly-iii:release-$VERSION-amd
fi fi

6
.deploy/docker/manifest.sh
View File

@@ -2,7 +2,7 @@
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 ARM=jc5x/firefly-iii:develop-arm
AMD=jc5x/firefly-iii:develop AMD=jc5x/firefly-iii:develop-amd
docker manifest create $TARGET $AMD $ARM docker manifest create $TARGET $AMD $ARM
docker manifest annotate $TARGET $ARM --arch arm --os linux docker manifest annotate $TARGET $ARM --arch arm --os linux
@@ -15,7 +15,7 @@ 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 ARM=jc5x/firefly-iii:latest-arm
AMD=jc5x/firefly-iii:latest AMD=jc5x/firefly-iii:latest-amd
docker manifest create $TARGET $AMD $ARM docker manifest create $TARGET $AMD $ARM
docker manifest annotate $TARGET $ARM --arch arm --os linux docker manifest annotate $TARGET $ARM --arch arm --os linux
@@ -25,7 +25,7 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then
# 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 ARM=jc5x/firefly-iii:release-$VERSION-arm
AMD=jc5x/firefly-iii:release-$VERSION AMD=jc5x/firefly-iii:release-$VERSION-amd
docker manifest create $TARGET $AMD $ARM docker manifest create $TARGET $AMD $ARM
docker manifest annotate $TARGET $ARM --arch arm --os linux docker manifest annotate $TARGET $ARM --arch arm --os linux