From c959399c56c019fe7ed37fa79feea4a630dc58c3 Mon Sep 17 00:00:00 2001 From: "Aode (lion)" Date: Mon, 6 Sep 2021 15:26:30 -0500 Subject: [PATCH] Update manifest, deploy --- docker/prod/deploy.sh | 4 ++-- docker/prod/manifest.sh | 31 +++++++++++++++++-------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh index 9e71d0e..19e71c2 100755 --- a/docker/prod/deploy.sh +++ b/docker/prod/deploy.sh @@ -78,8 +78,8 @@ build_image $new_tag amd64 $push # TODO if [ "$push" == "true" ]; then - ./manifest.sh $new_tag - ./manifest.sh latest + ./manifest.sh pictrs $new_tag + ./manifest.sh pictrs latest pushd ../../ cargo publish diff --git a/docker/prod/manifest.sh b/docker/prod/manifest.sh index 814c321..d426a97 100755 --- a/docker/prod/manifest.sh +++ b/docker/prod/manifest.sh @@ -11,30 +11,33 @@ function print_help() { echo "deploy.sh" echo "" echo "Usage:" - echo " manifest.sh [tag]" + echo " manifest.sh [repo] [tag]" echo "" echo "Args:" + echo " repo: The docker repository to update" echo " tag: The git tag to be applied to the image manifest" } -new_tag=$1 +REPO=$1 +TAG=$2 -require "$new_tag" "tag" +require "$REPO" "repo" +require "$TAG" "tag" set -xe -sudo docker manifest create asonix/pictrs:$new_tag \ - -a asonix/pictrs:arm64v8-$new_tag \ - -a asonix/pictrs:arm32v7-$new_tag \ - -a asonix/pictrs:amd64-$new_tag +sudo docker manifest create asonix/$REPO:$TAG \ + -a asonix/$REPO:arm64v8-$TAG \ + -a asonix/$REPO:arm32v7-$TAG \ + -a asonix/$REPO:amd64-$TAG -sudo docker manifest annotate asonix/pictrs:$new_tag \ - asonix/pictrs:arm64v8-$new_tag --os linux --arch arm64 --variant v8 +sudo docker manifest annotate asonix/$REPO:$TAG \ + asonix/$REPO:arm64v8-$TAG --os linux --arch arm64 --variant v8 -sudo docker manifest annotate asonix/pictrs:$new_tag \ - asonix/pictrs:arm32v7-$new_tag --os linux --arch arm --variant v7 +sudo docker manifest annotate asonix/$REPO:$TAG \ + asonix/$REPO:arm32v7-$TAG --os linux --arch arm --variant v7 -sudo docker manifest annotate asonix/pictrs:$new_tag \ - asonix/pictrs:amd64-$new_tag --os linux --arch amd64 +sudo docker manifest annotate asonix/$REPO:$TAG \ + asonix/$REPO:amd64-$TAG --os linux --arch amd64 -sudo docker manifest push asonix/pictrs:$new_tag --purge +sudo docker manifest push asonix/$REPO:$TAG --purge