Revert Dockerfiles back to their original but update get_branch_name.…

…sh to also strip off refs/tags/
dtcenter · Feb 7, 2024 · 569be8e · 569be8e
1 parent 3ed0526
commit 569be8e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/jobs/get_branch_name.sh b/.github/jobs/get_branch_name.sh
@@ -10,6 +10,7 @@ else
 fi
 
 branch_name=${branch_name#"refs/heads/"}
+branch_name=${branch_name#"refs/tags/"}
 
 echo "branch_name=${branch_name}" >> $GITHUB_OUTPUT
 echo branch_name: $branch_name
diff --git a/internal/scripts/docker/Dockerfile b/internal/scripts/docker/Dockerfile
@@ -19,7 +19,7 @@ RUN if [ "x${SOURCE_BRANCH}" = "x" ]; then \
       echo "Build Argument SOURCE_BRANCH=${SOURCE_BRANCH}"; \
     fi
 
-ENV MET_GIT_NAME    $(echo ${SOURCE_BRANCH} | sed 's%/%_%g')
+ENV MET_GIT_NAME    ${SOURCE_BRANCH}
 ENV MET_REPO_DIR    /met/MET-${MET_GIT_NAME}
 ENV MET_GIT_URL     https://github.com/dtcenter/MET
 ENV MET_DEVELOPMENT true

diff --git a/internal/scripts/docker/Dockerfile.copy b/internal/scripts/docker/Dockerfile.copy
@@ -19,7 +19,7 @@ RUN if [ "x${SOURCE_BRANCH}" = "x" ]; then \
       echo "Build Argument SOURCE_BRANCH=${SOURCE_BRANCH}"; \
     fi
 
-ENV MET_GIT_NAME    $(echo ${SOURCE_BRANCH} | sed 's%/%_%g')
+ENV MET_GIT_NAME    ${SOURCE_BRANCH}
 ENV MET_REPO_DIR    /met/MET-${MET_GIT_NAME}
 ENV MET_GIT_URL     https://github.com/dtcenter/MET
 ENV MET_DEVELOPMENT true