From a69c3f185590d9e3cf009ee180f44115e4afca41 Mon Sep 17 00:00:00 2001
From: GilbN <gilberg@gmail.com>
Date: Sun, 3 Apr 2022 16:43:03 +0200
Subject: [PATCH] Manifest fixes

---
 .github/workflows/docker-build.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 0327b5b3..1d9af442 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -85,7 +85,7 @@ jobs:
             org.opencontainers.image.source=${{ steps.prep.outputs.source }}
             org.opencontainers.image.vendor=${{ steps.prep.outputs.vendor }}
             org.opencontainers.image.url=${{ steps.prep.outputs.url }}
-            org.opencontainers.image.version=${{ steps.prep.outputs.version }}
+            org.opencontainers.image.version=${{ steps.prep.outputs.VERSION }}
           build-args: |
             TP_RELEASE=${{ steps.prep.outputs.VERSION }}
             BUILD_DATE=${{ steps.date_time.outputs.created }}
@@ -130,11 +130,7 @@ jobs:
           [[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7
           docker manifest create ${IMAGE}:${TAG} ${AMD64} ${ARM64} ${ARMV7}
           docker manifest push   ${IMAGE}:${TAG}
-          if [[! -z "${VERSION}" ]]; then
-          docker manifest create ${IMAGE}:${TAG}-${VERSION//\~/-} ${AMD64} ${ARM64} ${ARMV7}
-          docker manifest push   ${IMAGE}:${TAG}-${VERSION//\~/-}
-          docker manifest create ${IMAGE}:${VERSION//\~/-} ${AMD64} ${ARM64} ${ARMV7}
-          docker manifest push   ${IMAGE}:${VERSION//\~/-}
+          if [[ ${VERSION} ]]; then
           docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7}
           docker manifest push   ${IMAGE}:latest
           fi