From ed31e185f80f60dd0c9d280118321f122383dc95 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Fri, 26 Nov 2021 10:25:35 +0100
Subject: [PATCH] Shorten default docker image name
---
ci-templates/industrial-ci-templates.yml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index 4281ca8..d14b522 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -43,6 +43,14 @@
# Get ID of image created by ddeploy
- 'DOCKER_ID=$(docker images --format="{{.ID}}" | head -1)'
- curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/enforce_labels.bash | bash -s -- ${DOCKER_ID}
+ # if USER_DOCKER_PUSH_NAME is not defined, shorten the default DOCKER_PUSH_NAME
+ - >
+ if [ -z ${USER_DOCKER_PUSH_NAME} ] ; then
+ echo USER_DOCKER_PUSH_NAME was not defined, using default docker image name
+ DOCKER_PUSH_NAME=${DOCKER_PUSH_NAME#$CI_PROJECT_ROOT_NAMESPACE/}
+ else
+ DOCKER_PUSH_NAME=${USER_DOCKER_PUSH_NAME}
+ fi
# Tag and push with the branch or tag name.
- echo "Pushing to ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}"
- docker tag ${DOCKER_ID} ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}
--
GitLab