From a03196342d8085eb25e846a3e3044637646895c4 Mon Sep 17 00:00:00 2001 From: Alex Ellis Date: Sun, 26 May 2019 19:51:06 +0100 Subject: [PATCH] Push multi-arch image for watchdog Signed-off-by: Alex Ellis --- .travis.yml | 4 ++++ watchdog/build.sh | 1 + watchdog/make_manifest.sh | 17 +++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100755 watchdog/make_manifest.sh diff --git a/.travis.yml b/.travis.yml index ce12e9d1..987409db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,10 @@ after_success: docker tag $DOCKER_NS/classic-watchdog:latest-dev-arm64 quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-arm64; docker tag $DOCKER_NS/classic-watchdog:latest-dev-windows quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-windows; docker tag $DOCKER_NS/classic-watchdog:latest-dev-x86_64 quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-x86_64; + + ./watchdog/make_manifest.sh + docker push $DOCKER_NS/classic-watchdog:$TRAVIS_TAG + echo $QUAY_PASSWORD | docker login -u=$QUAY_USERNAME --password-stdin quay.io; docker push quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-armhf; docker push quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-arm64; diff --git a/watchdog/build.sh b/watchdog/build.sh index 67244ab1..8ddd0e43 100755 --- a/watchdog/build.sh +++ b/watchdog/build.sh @@ -35,3 +35,4 @@ docker cp buildoutput:/go/src/github.com/openfaas/faas/watchdog/watchdog-arm64 . docker cp buildoutput:/go/src/github.com/openfaas/faas/watchdog/watchdog.exe ./fwatchdog.exe docker rm buildoutput + diff --git a/watchdog/make_manifest.sh b/watchdog/make_manifest.sh new file mode 100755 index 00000000..11097ed1 --- /dev/null +++ b/watchdog/make_manifest.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +export USR=$DOCKER_NS +export TAG=$TRAVIS_TAG + +docker manifest create $USR/classic-watchdog:$TAG \ + openfaas/classic-watchdog:$TAG-x86_64 \ + openfaas/classic-watchdog:$TAG-armhf \ + openfaas/classic-watchdog:$TAG-arm64 \ + openfaas/classic-watchdog:$TAG-windows + +docker manifest annotate $USR/classic-watchdog:$TAG --arch arm openfaas/classic-watchdog:$TAG-armhf +docker manifest annotate $USR/classic-watchdog:$TAG --arch arm64 openfaas/classic-watchdog:$TAG-arm64 +docker manifest annotate $USR/classic-watchdog:$TAG --os windows openfaas/classic-watchdog:$TAG-windows + +docker manifest push $USR/classic-watchdog:$TAG +