diff --git a/smp-docker/images/build-docker-images.sh b/smp-docker/images/build-docker-images.sh index 3ef7c02d1d959eefc43e6d3a35ce4c08ffd17a16..dd2807a70be34d2717046ff4064657eae26b5813 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")