From 5f59877a5b258a080bb93661b5bd4cdd82282008 Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Thu, 9 Nov 2023 11:26:39 -0700 Subject: [PATCH 1/2] Per #13, change tar_files.tgz to tar_files.develop.tgz --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a5fbd54..74613ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,10 +70,10 @@ RUN wget https://www.python.org/ftp/python/${PYTHON_VER}/Python-${PYTHON_VER}.tg # ARG MET_COMPILE_SCRIPT_BRANCH=develop RUN echo "Pulling compilation script from MET branch ${MET_COMPILE_SCRIPT_BRANCH}" \ - && wget https://dtcenter.ucar.edu/dfiles/code/METplus/MET/installation/tar_files.tgz \ + && wget https://dtcenter.ucar.edu/dfiles/code/METplus/MET/installation/tar_files.develop.tgz \ && wget https://raw.githubusercontent.com/dtcenter/MET/${MET_COMPILE_SCRIPT_BRANCH}/internal/scripts/installation/compile_MET_all.sh \ && wget https://raw.githubusercontent.com/dtcenter/MET/${MET_COMPILE_SCRIPT_BRANCH}/internal/scripts/environment/development.docker \ - && tar -zxf tar_files.tgz \ + && tar -zxf tar_files.develop.tgz \ && export SKIP_MET=TRUE \ && chmod +x compile_MET_all.sh \ && ./compile_MET_all.sh development.docker From 7519f5b964dcb91eb9ed56a8cf2451d0008d6054 Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Thu, 9 Nov 2023 14:15:25 -0700 Subject: [PATCH 2/2] Per #13, update hard-coded 'develop' to be a variable from the argument MET_TAR_FILE_VERSION_NAME --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74613ff..6794644 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,11 +69,12 @@ RUN wget https://www.python.org/ftp/python/${PYTHON_VER}/Python-${PYTHON_VER}.tg # Compile the MET libraries # ARG MET_COMPILE_SCRIPT_BRANCH=develop +ARG MET_TAR_FILE_VERSION_NAME=met-base-v3.1 RUN echo "Pulling compilation script from MET branch ${MET_COMPILE_SCRIPT_BRANCH}" \ - && wget https://dtcenter.ucar.edu/dfiles/code/METplus/MET/installation/tar_files.develop.tgz \ + && wget https://dtcenter.ucar.edu/dfiles/code/METplus/MET/installation/tar_files.${MET_TAR_FILE_VERSION_NAME}.tgz \ && wget https://raw.githubusercontent.com/dtcenter/MET/${MET_COMPILE_SCRIPT_BRANCH}/internal/scripts/installation/compile_MET_all.sh \ && wget https://raw.githubusercontent.com/dtcenter/MET/${MET_COMPILE_SCRIPT_BRANCH}/internal/scripts/environment/development.docker \ - && tar -zxf tar_files.develop.tgz \ + && tar -zxf tar_files.${MET_TAR_FILE_VERSION_NAME}.tgz \ && export SKIP_MET=TRUE \ && chmod +x compile_MET_all.sh \ && ./compile_MET_all.sh development.docker