RED-5277 update build-script EXPERIMENTAL

bamboo-specs/src/main/resources/scripts/docker-build.sh

@@ -11,9 +11,11 @@ then
     echo "new release on master with version $newVersion"
 elif [[ "$bamboo_planRepository_branchName" == release* ]]
 then
-    branchVersion=$(echo $bamboo_planRepository_branchName | sed -s 's|release\/\([0-9]\+\.[0-9]\+\)\.x|\1|')
-    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
-    newVersion="$(semver $latestVersion -p -i patch)"
+#    branchVersion=$(echo $bamboo_planRepository_branchName | sed -s 's|release\/\([0-9]\+\.[0-9]\+\)\.x|\1|')
+#    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
+#    newVersion="$(semver $latestVersion -p -i patch)"
+# FIXME: obviously not the best solution
+    newVersion="1.16.1"
     echo "new release on $bamboo_planRepository_branchName with version $newVersion"
 elif [[ "${bamboo_version_tag}" != "dev" ]]
 then
@@ -22,7 +24,8 @@ then
 else
     newVersion="${bamboo_planRepository_1_branch}_${bamboo_buildNumber}"
     echo "gitTag=${newVersion}" > git.tag
-    echo "dev build with tag ${newVersion}"
+    dev_tag="dev"
+    echo "dev build with tag $dev_tag"
     python3 -m venv build_venv
     source build_venv/bin/activate
     python3 -m pip install --upgrade pip
@@ -34,7 +37,8 @@ else
     echo "index-url = https://${bamboo_nexus_user}:${bamboo_nexus_password}@nexus.iqser.com/repository/python-combind/simple" >> pip.conf
     echo "${bamboo_nexus_password}" | docker login --username "${bamboo_nexus_user}" --password-stdin nexus.iqser.com:5001
     docker build -f Dockerfile_base -t $SERVICE_NAME_BASE .
-    docker build -f Dockerfile  -t nexus.iqser.com:5001/red/$SERVICE_NAME:${newVersion} .
+    docker build -f Dockerfile  -t nexus.iqser.com:5001/red/$SERVICE_NAME:$dev_tag .
+    docker push nexus.iqser.com:5001/red/$SERVICE_NAME:$dev_tag
     exit 0
 fi
 
@@ -53,4 +57,4 @@ echo "index-url = https://${bamboo_nexus_user}:${bamboo_nexus_password}@nexus.iq
 docker build -f Dockerfile_base -t $SERVICE_NAME_BASE .
 docker build -f Dockerfile  -t nexus.iqser.com:5001/red/$SERVICE_NAME:${newVersion} .
 echo "${bamboo_nexus_password}" | docker login --username "${bamboo_nexus_user}" --password-stdin nexus.iqser.com:5001
-docker push nexus.iqser.com:5001/red/$SERVICE_NAME:${newVersion}
+docker push nexus.iqser.com:5001/red/$SERVICE_NAME:${newVersion}

incl/pyinfra

@@ -1 +1 @@
-Subproject commit 64d6a8cec62eeddf26bd71a9aabc28b40dcec901
+Subproject commit 8d2a9240d1cb7549b3e136814eaf11c82dd78ffd