Per #521, for the main_v5.1 branch, set the METplus-Analysis dependen…

…cy versions as main_v2.1 rather than develop. Note that DockerHub already uses the hooks/build file to define the dependencies... but the SonarQube workflow actually uses the versions listed in the Dockerifle. Note that issue #527 will clean up and refine this version depedency logic.

internal/scripts/docker/Dockerfile

@@ -8,9 +8,9 @@ MAINTAINER Tatiana Burek <[email protected]>
 #
 
 ARG METVIEWER_GIT_NAME
-ARG METPLOTPY_GIT_NAME=develop
-ARG METCALCPY_GIT_NAME=develop
-ARG METDATAIO_GIT_NAME=develop
+ARG METPLOTPY_GIT_NAME=main_v2.1
+ARG METCALCPY_GIT_NAME=main_v2.1
+ARG METDATAIO_GIT_NAME=main_v2.1
 
 #
 # METVIEWER_GIT_NAME is required.

internal/scripts/docker/Dockerfile.apptainer

@@ -8,9 +8,9 @@ MAINTAINER Tatiana Burek <[email protected]>
 #
 
 ARG METVIEWER_GIT_NAME
-ARG METPLOTPY_GIT_NAME=develop
-ARG METCALCPY_GIT_NAME=develop
-ARG METDATAIO_GIT_NAME=develop
+ARG METPLOTPY_GIT_NAME=main_v2.1
+ARG METCALCPY_GIT_NAME=main_v2.1
+ARG METDATAIO_GIT_NAME=main_v2.1
 
 #
 # METVIEWER_GIT_NAME is required.

internal/scripts/docker/Dockerfile.copy

@@ -8,9 +8,9 @@ MAINTAINER Tatiana Burek <[email protected]>
 #
 
 ARG SOURCE_BRANCH
-ARG METPLOTPY_GIT_NAME=develop
-ARG METCALCPY_GIT_NAME=develop
-ARG METDATAIO_GIT_NAME=develop
+ARG METPLOTPY_GIT_NAME=main_v2.1
+ARG METCALCPY_GIT_NAME=main_v2.1
+ARG METDATAIO_GIT_NAME=main_v2.1
 
 #
 # SOURCE_BRANCH is required to define the branch of the local METviewer repository.

internal/scripts/docker/hooks/build

@@ -7,7 +7,7 @@
 
 docker build -t $IMAGE_NAME \
 --build-arg METVIEWER_GIT_NAME=$SOURCE_BRANCH \
---build-arg METCALCPY_GIT_NAME=main_v2.1.0 \
---build-arg METDATAIO_GIT_NAME=main_v2.1.0 \
---build-arg METPLOTPY_GIT_NAME=main_v2.1.0 .
+--build-arg METCALCPY_GIT_NAME=main_v2.1 \
+--build-arg METDATAIO_GIT_NAME=main_v2.1 \
+--build-arg METPLOTPY_GIT_NAME=main_v2.1 .