Bugfix #2390 develop compile zlib (#2404)

dtcenter · Jan 18, 2023 · 8b7c7cf · 8b7c7cf
1 parent 05223ce
commit 8b7c7cf
Show file tree

Hide file tree

Showing 3 changed files with 238 additions and 502 deletions.
diff --git a/internal/scripts/docker/build_met_docker.sh b/internal/scripts/docker/build_met_docker.sh
@@ -13,16 +13,20 @@ if [ $? != 0 ]; then
     exit 1
 fi
 
+if [ ! -z "${MAKE_ARGS}" ]; then
+  echo Adding make arguments: ${MAKE_ARGS}
+fi
+
 LOG_FILE=/met/MET-${MET_GIT_NAME}/make_install.log
 echo "Compiling MET ${MET_GIT_NAME} and writing log file ${LOG_FILE}"
-make install > ${LOG_FILE}
+make ${MAKE_ARGS} install > ${LOG_FILE}
 if [ $? != 0 ]; then
     exit 1
 fi
 
 LOG_FILE=/met/logs/MET-${MET_GIT_NAME}_make_test.log
 echo "Testing MET ${MET_GIT_NAME} and writing log file ${LOG_FILE}"
-make test > ${LOG_FILE} 2>&1
+make ${MAKE_ARGS} test > ${LOG_FILE} 2>&1
 if [ $? != 0 ]; then
     exit 1
 fi

diff --git a/internal/scripts/environment/development.docker b/internal/scripts/environment/development.docker
@@ -42,3 +42,5 @@ export MET_FONT_DIR=${MET_TEST_INPUT}/fonts
 # Define Rscript to use a version with the ncdf4 package 1.17 or later 
 export MET_TEST_RSCRIPT=/usr/bin/Rscript
 
+# set make arguments to build using multiple jobs
+export MAKE_ARGS=-j