From 7abf432eb2826bff61af435b5951830018f48030 Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <Joze.RIHTARSIC@ext.ec.europa.eu>
Date: Fri, 30 Apr 2021 07:29:06 +0200
Subject: [PATCH] fix SMP version for docker build
---
smp-docker/images/build-docker-images.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/smp-docker/images/build-docker-images.sh b/smp-docker/images/build-docker-images.sh
index 3ef7c02d1..dd2807a70 100755
--- a/smp-docker/images/build-docker-images.sh
+++ b/smp-docker/images/build-docker-images.sh
@@ -47,12 +47,16 @@ while getopts v:o:s:c:p: option; do
esac
done
-if [[ -z "${SML_VERSION}" ]]; then
+if [[ -z "${SMP_VERSION}" ]]; then
# get version from setup file
- #cd "${SMP_ARTEFACTS}"
- #SMP_VERSION="$(ls smp-*-setup.zip | sed -e 's/.*smp-//g' | sed -e 's/-setup\.zip$//g')"
- SMP_VERSION="$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)"
+ echo "Get version from the pom: $(pwd)"
+ SMP_VERSION="$(mvn org.apache.maven.plugins:maven-help-plugin:evaluate -Dexpression=project.version -q -DforceStdout)"
# go back to dirname
+ if [[ -z "${SMP_VERSION}" ]]; then
+ echo "Try to get version from artefacts: $(ls -ltr $SMP_ARTEFACTS)"
+ SMP_VERSION="$(ls ${SMP_ARTEFACTS}/smp-*-setup.zip | sed -e 's/.*smp-//g' | sed -e 's/-setup\.zip$//g')"
+ fi
+
fi
DIRNAME=$(dirname "$0")
--
GitLab