applied the same changes as PR #1907 did for develop to ensure a METp…

…lus bugfix release will properly create an image for the release via DockerHub dtcenter/metplus build rules
dtcenter · Nov 3, 2022 · 0ae1743 · 0ae1743
1 parent 9daac01
commit 0ae1743
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/.github/jobs/docker_setup.sh b/.github/jobs/docker_setup.sh
@@ -29,9 +29,9 @@ duration=$(( SECONDS - start_seconds ))
 echo "TIMING: docker pull ${DOCKERHUB_TAG} took `printf '%02d' $(($duration / 60))`:`printf '%02d' $(($duration % 60))` (MM:SS)"
 
 # set DOCKERFILE_PATH that is used by docker hook script get_met_version
-export DOCKERFILE_PATH=${GITHUB_WORKSPACE}/scripts/docker/Dockerfile
+export DOCKERFILE_PATH=${GITHUB_WORKSPACE}/internal/scripts/docker/Dockerfile
 
-MET_TAG=`${GITHUB_WORKSPACE}/scripts/docker/hooks/get_met_version`
+MET_TAG=`${GITHUB_WORKSPACE}/internal/scripts/docker/hooks/get_met_version`
 
 MET_DOCKER_REPO=met-dev
 if [ "${MET_TAG}" != "develop" ]; then

diff --git a/scripts/docker/Dockerfile → internal/scripts/docker/Dockerfile b/scripts/docker/Dockerfile → internal/scripts/docker/Dockerfile
diff --git a/scripts/docker/hooks/build → internal/scripts/docker/hooks/build b/scripts/docker/hooks/build → internal/scripts/docker/hooks/build
diff --git a/scripts/docker/hooks/get_met_version → ...rnal/scripts/docker/hooks/get_met_version b/scripts/docker/hooks/get_met_version → ...rnal/scripts/docker/hooks/get_met_version
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # get version, use develop or X+6.Y for MET_BRANCH
-version_file=$(dirname $DOCKERFILE_PATH)/../../metplus/VERSION
+version_file=$(dirname $DOCKERFILE_PATH)/../../../metplus/VERSION
 
 if cat $version_file | egrep -q '^[0-9.]+$'; then
   let major=$(cut -d '.' -f1 $version_file)+6