Merge pull request #4496 from ESMCI/update-docker

Updates libnetcdf to 4.9.1.

Test suite:
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]

Fixes [CIME Github issue #]
User interface changes?:
Update gh-pages html (Y/N)?:

docker/Dockerfile

@@ -4,13 +4,13 @@ FROM condaforge/mambaforge:${MAMBAFORGE_VERSION} AS base
 ARG PNETCDF_VERSION=1.12.3
 ENV PNETCDF_VERSION=${PNETCDF_VERSION}
 
-ARG LIBNETCDF_VERSION=4.8.1
+ARG LIBNETCDF_VERSION=4.9.1
 ENV LIBNETCDF_VERSION=${LIBNETCDF_VERSION}
 
-ARG NETCDF_FORTRAN_VERSION=4.6.0
+ARG NETCDF_FORTRAN_VERSION=*
 ENV NETCDF_FORTRAN_VERSION=${NETCDF_FORTRAN_VERSION}
 
-ARG ESMF_VERSION=8.4.0
+ARG ESMF_VERSION=*
 ENV ESMF_VERSION=${ESMF_VERSION}
 
 ARG GCC_VERSION=10.*

docker/docker.cmake

@@ -1,7 +1,8 @@
 string(APPEND CXXFLAGS " -std=c++14")
 string(APPEND CXX_LIBS " -lstdc++")
 string(APPEND FFLAGS " -I/opt/conda/include")
-string(APPEND SLIBS " -L/opt/conda/lib")
+# required for grid generation tests that use make
+string(APPEND SLIBS " -L/opt/conda/lib -lnetcdf -lnetcdff")
 set(MPI_PATH "/opt/conda")
 if (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
   string(APPEND FFLAGS " -fallow-argument-mismatch  -fallow-invalid-boz ")