From ffe332ccfbf09775b684ff23adfb5804fac661af Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Tue, 16 Feb 2021 07:53:29 -0700
Subject: [PATCH] docker: tag multi-arch images as well

Signed-off-by: nachoparker <nacho@ownyourbits.com>
---
 batch.sh              | 27 +++++++++++++++++++--------
 config-odroidc2.conf  |  5 +++++
 config-odroidhc4.conf |  5 +++++
 3 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 config-odroidc2.conf
 create mode 100644 config-odroidhc4.conf

diff --git a/batch.sh b/batch.sh
index 5cc3c744..00749e09 100755
--- a/batch.sh
+++ b/batch.sh
@@ -90,17 +90,28 @@ export DOCKER_CLI_EXPERIMENTAL=enabled
 #}
 
 # Docker multi-arch
-docker manifest create --amend ownyourbits/nextcloudpi \
-  ownyourbits/nextcloudpi-x86 \
-  ownyourbits/nextcloudpi-armhf \
-  ownyourbits/nextcloudpi-arm64
+docker manifest create --amend ownyourbits/nextcloudpi:${version} \
+  --amend ownyourbits/nextcloudpi-x86:${version} \
+  --amend ownyourbits/nextcloudpi-armhf:${version} \
+  --amend ownyourbits/nextcloudpi-arm64:${version}
+
+docker manifest create --amend ownyourbits/nextcloudpi:latest \
+  --amend ownyourbits/nextcloudpi-x86:latest \
+  --amend ownyourbits/nextcloudpi-armhf:latest \
+  --amend ownyourbits/nextcloudpi-arm64:latest
 
 
-docker manifest annotate ownyourbits/nextcloudpi ownyourbits/nextcloudpi-x86   --os linux --arch amd64
-docker manifest annotate ownyourbits/nextcloudpi ownyourbits/nextcloudpi-armhf --os linux --arch arm
-docker manifest annotate ownyourbits/nextcloudpi ownyourbits/nextcloudpi-arm64 --os linux --arch arm64
+docker manifest annotate ownyourbits/nextcloudpi:${version} ownyourbits/nextcloudpi-x86:${version}   --os linux --arch amd64
+docker manifest annotate ownyourbits/nextcloudpi:${version} ownyourbits/nextcloudpi-armhf:${version} --os linux --arch arm
+docker manifest annotate ownyourbits/nextcloudpi:${version} ownyourbits/nextcloudpi-arm64:${version} --os linux --arch arm64
+
+docker manifest annotate ownyourbits/nextcloudpi:latest ownyourbits/nextcloudpi-x86:latest   --os linux --arch amd64
+docker manifest annotate ownyourbits/nextcloudpi:latest ownyourbits/nextcloudpi-armhf:latest --os linux --arch arm
+docker manifest annotate ownyourbits/nextcloudpi:latest ownyourbits/nextcloudpi-arm64:latest --os linux --arch arm64
+
+docker manifest push -p ownyourbits/nextcloudpi:${version}
+docker manifest push -p ownyourbits/nextcloudpi:latest
 
-docker manifest push -p ownyourbits/nextcloudpi
 
 # License
 #
diff --git a/config-odroidc2.conf b/config-odroidc2.conf
new file mode 100644
index 00000000..e3b8e8b5
--- /dev/null
+++ b/config-odroidc2.conf
@@ -0,0 +1,5 @@
+#
+# Place here configuration options that differ from standard NCP build options
+#
+
+#BRANCH=dev
diff --git a/config-odroidhc4.conf b/config-odroidhc4.conf
new file mode 100644
index 00000000..e3b8e8b5
--- /dev/null
+++ b/config-odroidhc4.conf
@@ -0,0 +1,5 @@
+#
+# Place here configuration options that differ from standard NCP build options
+#
+
+#BRANCH=dev