Mention amd specifically.

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

View File

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

View File

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