From 7bdeb9ba233482fdb5671ae1f84f77a55ee9bd85 Mon Sep 17 00:00:00 2001
From: Marcel Feix <marcel.feix@exxcellent.de>
Date: Fri, 10 Jun 2022 09:46:47 +0200
Subject: [PATCH] fix(Container publishing): Revert back to Container Registry
 not Registry image

---
 .../chapters/templates/container/container-publish.adoc       | 4 ++--
 templates/container/container-publish.gitlab-ci.yml           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/documentation/chapters/templates/container/container-publish.adoc b/documentation/chapters/templates/container/container-publish.adoc
index f899f0b..60e0202 100644
--- a/documentation/chapters/templates/container/container-publish.adoc
+++ b/documentation/chapters/templates/container/container-publish.adoc
@@ -8,10 +8,10 @@ Needs a build container on the path `image.tar`. Use one of the Container build
 .Variables
 |===
 |Name |Description | Default Value
-| CONTAINER_REGISTRY_IMAGE | The address of the project’s Container Registry.   | $CI_REGISTRY_IMAGE
+| CONTAINER_REGISTRY | The address of the project’s Container Registry.   | $CI_REGISTRY
 | CONTAINER_REGISTRY_USER | the user that should be used  | $CI_REGISTRY_USER
 | CONTAINER_REGISTRY_PASSWORD | the password for the remote registry  | $CI_REGISTRY_PASSWORD
-| EXTRA_PATH | Extra path that should be between the registry path and the image tag | ""
+| EXTRA_PATH | Extra path that should be between the registry path and the image tag. Has to start with a "/" | ""
 | IMAGE_TAG | the Tag the image should be found on | Depends on the current path. Look at the rules of the Job.
 |===
 
diff --git a/templates/container/container-publish.gitlab-ci.yml b/templates/container/container-publish.gitlab-ci.yml
index 270bca7..c1f3ee0 100644
--- a/templates/container/container-publish.gitlab-ci.yml
+++ b/templates/container/container-publish.gitlab-ci.yml
@@ -4,7 +4,7 @@
     name: quay.io/containers/skopeo:v1.5.2
     entrypoint: [ "" ]
   variables:
-    CONTAINER_REGISTRY: $CI_REGISTRY_IMAGE
+    CONTAINER_REGISTRY: $CI_REGISTRY
     CONTAINER_REGISTRY_USER: $CI_REGISTRY_USER
     CONTAINER_REGISTRY_PASSWORD: $CI_REGISTRY_PASSWORD
     EXTRA_PATH: ""
@@ -23,4 +23,4 @@
     - when: never
   script:
     - skopeo login --username $CONTAINER_REGISTRY_USER --password $CONTAINER_REGISTRY_PASSWORD $CONTAINER_REGISTRY --tls-verify=false
-    - skopeo copy "docker-archive:image.tar" "docker://${CONTAINER_REGISTRY}${EXTRA_PATH}:${IMAGE_TAG}" $EXTRA_ARGS --dest-tls-verify=false
+    - skopeo copy "docker-archive:image.tar" "docker://${CONTAINER_REGISTRY}${EXTRA_PATH}:${IMAGE_TAG}" $EXTRA_ARGS --dest-tls-verify=false
\ No newline at end of file