From 8a057e4d7a531bfe080d70b43aab1691bedbbb5b Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Mon, 8 Jun 2020 15:31:25 -0500
Subject: [PATCH] Version v0.1.0-r12

---
 docker/prod/deploy.sh          |  5 ++---
 docker/prod/docker-compose.yml |  2 +-
 docker/prod/manifest.sh        | 27 ++++++++++++---------------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 593a489..55e2fd8 100755
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -50,7 +50,7 @@ set -xe
 git checkout master
 
 # Changing the docker-compose prod
-sed -i "s/asonix\/pictrs:.*/asonix\/pictrs:amd64-$new_tag/" docker-compose.yml
+sed -i "s/asonix\/pictrs:.*/asonix\/pictrs:$new_tag/" docker-compose.yml
 git add ../prod/docker-compose.yml
 
 # The commit
@@ -69,5 +69,4 @@ build_image $new_tag amd64
 # Build for other archs
 # TODO
 
-# TODO: docker manifest
-# docker manifest push asonix/pictrs:$new_tag
+./manifest.sh $new_tag
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index df87e56..c97d659 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   pictrs:
-    image: asonix/pictrs:amd64-v0.1.0-r11
+    image: asonix/pictrs:v0.1.0-r12
     ports:
       - "127.0.0.1:8080:8080"
     restart: always
diff --git a/docker/prod/manifest.sh b/docker/prod/manifest.sh
index c72e492..905205c 100755
--- a/docker/prod/manifest.sh
+++ b/docker/prod/manifest.sh
@@ -17,14 +17,6 @@ function print_help() {
     echo "	tag: The git tag to be applied to the image manifest"
 }
 
-function annotate() {
-    tag=$1
-    arch=$2
-
-    docker manifest annotate asonix/pictrs:$tag \
-        asonix/pictrs:$arch-$tag --os linux --arch $arch
-}
-
 new_tag=$1
 
 require "$new_tag" "tag"
@@ -32,12 +24,17 @@ require "$new_tag" "tag"
 set -xe
 
 docker manifest create asonix/pictrs:$new_tag \
-    asonix/pictrs:arm64v8-$new_tag \
-    asonix/pictrs:arm32v7-$new_tag \
-    asonix/pictrs:amd64-$new_tag
+    -a asonix/pictrs:arm64v8-$new_tag \
+    -a asonix/pictrs:arm32v7-$new_tag \
+    -a asonix/pictrs:amd64-$new_tag
 
-annotate $new_tag arm64v8
-annotate $new_tag arm32v7
-annotate $new_tag amd64
+docker manifest annotate asonix/pictrs:$new_tag \
+    asonix/pictrs:arm64v8-$new_tag --os linux --arch arm64 --variant v8
 
-# docker manifest push asonix/pictrs:$new_tag
+docker manifest annotate asonix/pictrs:$new_tag \
+    asonix/pictrs:arm32v7-$new_tag --os linux --arch arm --variant v7
+
+docker manifest annotate asonix/pictrs:$new_tag \
+    asonix/pictrs:amd64-$new_tag --os linux --arch amd64
+
+docker manifest push asonix/pictrs:$new_tag --purge