Per #2196, update for upgrade to Python 3.8.6

dtcenter · Aug 30, 2022 · 602d653 · 602d653
1 parent c7bbab9
commit 602d653
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/internal/scripts/docker/Dockerfile b/internal/scripts/docker/Dockerfile
@@ -1,5 +1,5 @@
 ARG MET_BASE_REPO=met-base
-ARG MET_BASE_IMAGE=v1.0
+ARG MET_BASE_IMAGE=v1.1
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_IMAGE}
 MAINTAINER John Halley Gotway <[email protected]>

diff --git a/internal/scripts/docker/Dockerfile.copy b/internal/scripts/docker/Dockerfile.copy
@@ -1,5 +1,5 @@
 ARG MET_BASE_REPO=met-base
-ARG MET_BASE_IMAGE=v1.0
+ARG MET_BASE_IMAGE=v1.1
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_IMAGE}
 MAINTAINER John Halley Gotway <[email protected]>

diff --git a/internal/scripts/docker/build_met_docker.sh b/internal/scripts/docker/build_met_docker.sh
@@ -10,7 +10,8 @@ echo "Configuring MET ${MET_GIT_NAME} and writing log file ${LOG_FILE}"
     MET_HDF=/usr/local/hdf MET_HDFEOS=/usr/local/hdfeos \
     MET_FREETYPEINC=/usr/include/freetype2 MET_FREETYPELIB=/usr/lib \
     MET_CAIROINC=/usr/include/cairo MET_CAIROLIB=/usr/lib \
-    MET_PYTHON_CC='-I/usr/include/python3.6m' MET_PYTHON_LD='-lpython3.6m' > ${LOG_FILE}
+    MET_PYTHON_CC='-I/usr/local/include/python3.8' \
+    MET_PYTHON_LD='-L/usr/local/lib/python3.8/config-3.8-x86_64-linux-gnu -L/usr/local/lib/python3.8 -lpython3.8 -lcrypt -lpthread -ldl -lutil -lm -Xlinker -export-dynamic' > ${LOG_FILE}
 if [ $? != 0 ]; then
     exit 1
 fi