From 566840150d5e696d4a659ae8fa8b3add646bce9b Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Wed, 21 Aug 2024 14:39:29 +0200
Subject: [PATCH] Fix bamboo plan - push image
---
.../domismp-docker/images/build-docker-images.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/domismp-tests/domismp-docker/images/build-docker-images.sh b/domismp-tests/domismp-docker/images/build-docker-images.sh
index ac6a3cb06..1f69575ad 100755
--- a/domismp-tests/domismp-docker/images/build-docker-images.sh
+++ b/domismp-tests/domismp-docker/images/build-docker-images.sh
@@ -158,6 +158,7 @@ function pushImageToDockerhub() {
if [[ "V$SMP_IMAGE_PUBLISH" == "Vtrue" ]]; then
# login to docker
+ echo "Login to docker registry ${DOCKER_REGISTRY_HOST} with user ${DOCKER_USER}"
docker login --username="${DOCKER_USER}" --password="${DOCKER_PASSWORD}" "${DOCKER_REGISTRY_HOST}"
# push images
pushImageIfExisting "${IMAGE_SMP_TOMCAT_MYSQL}:${SMP_VERSION}"
@@ -169,13 +170,14 @@ function pushImageToDockerhub() {
}
function pushImageIfExisting() {
- if [[ "x$(docker images -q "${1}")" != "x" ]]; then
+ local IMAGE_NAME="${IMAGE_TAG:-edeliverytest}/${1}"
+ if [[ "x$(docker images -q "${IMAGE_NAME}")" != "x" ]]; then
local TAGGED_IMAGE="${DOCKER_REGISTRY_HOST:+$DOCKER_REGISTRY_HOST/}${DOCKER_FOLDER:+$DOCKER_FOLDER/}${1}"
- docker tag "${IMAGE_TAG:-edeliverytest}/${1}" "${TAGGED_IMAGE}"
+ docker tag "${IMAGE_NAME}" "${TAGGED_IMAGE}"
echo "Pushing image ${1} as ${TAGGED_IMAGE}"
docker push "${TAGGED_IMAGE}"
else
- echo "Could not find image ${1} to push!"
+ echo "Could not find image ${IMAGE_NAME} to push!"
fi
return 0
}
--
GitLab