Per #2068, revert to METbaseimage version 1.1.

dtcenter · Oct 29, 2022 · f860aa6 · f860aa6
1 parent 7203883
commit f860aa6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/jobs/set_job_controls.sh b/.github/jobs/set_job_controls.sh
@@ -6,7 +6,7 @@ run_unit_tests=false
 run_diff=false
 run_update_truth=false
 met_base_repo=met-base
-met_base_tag=v1.2
+met_base_tag=v1.1
 input_data_version=develop
 truth_data_version=develop
 

diff --git a/.github/workflows/build_docker_and_trigger_metplus.yml b/.github/workflows/build_docker_and_trigger_metplus.yml
@@ -29,7 +29,7 @@ jobs:
         env:
           SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}-lite
           MET_BASE_REPO: met-base
-          MET_BASE_TAG: v1.2
+          MET_BASE_TAG: v1.1
 
       - name: Push Docker Image
         run: .github/jobs/push_docker_image.sh

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_TAG=v1.2
+ARG MET_BASE_TAG=v1.1
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG}
 MAINTAINER John Halley Gotway <johnhg@ucar.edu>

diff --git a/internal/scripts/docker/Dockerfile.copy b/internal/scripts/docker/Dockerfile.copy
@@ -1,5 +1,5 @@
 ARG MET_BASE_REPO=met-base-unit-test
-ARG MET_BASE_TAG=v1.2
+ARG MET_BASE_TAG=v1.1
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG}
 MAINTAINER John Halley Gotway <johnhg@ucar.edu>

diff --git a/internal/scripts/environment/development.docker b/internal/scripts/environment/development.docker
@@ -24,8 +24,8 @@ export MET_FREETYPELIB=/usr/lib64
 export MET_JASPERLIB=/usr/lib64
 
 export MET_PYTHON=/usr/bin/python3
-export MET_PYTHON_CC="-I/usr/local/include/python3.8"
-export MET_PYTHON_LD="-L/usr/local/lib -lpython3.8 -lpthread -ldl -lutil -lm"
+export MET_PYTHON_CC="-I/usr/include/python3.6m"
+export MET_PYTHON_LD="-L/usr/lib64 -lpython3.6m -lpthread -ldl -lutil -lm"
 
 # -D__64BIT__ is required because we've compiled libgrib2c.a with that flag
 export CFLAGS="-DUNDERSCORE -fPIC -D__64BIT__ -g"