update dockerfiles, run remaining build scripts

rocker-org · Jan 23, 2024 · 18d9daf · 18d9daf
1 parent bba4a6e
commit 18d9daf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/dockerfiles/cuda_4.3.1.Dockerfile b/dockerfiles/cuda_4.3.1.Dockerfile
@@ -11,7 +11,9 @@ ENV TZ=Etc/UTC
 ENV NVBLAS_CONFIG_FILE=/etc/nvblas.conf
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PATH}:${CUDA_HOME}/bin
+ENV PURGE_BUILDDEPS=false
+ENV VIRTUAL_ENV=/opt/venv
+ENV PATH=${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin
 
 COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh
 

diff --git a/dockerfiles/cuda_4.3.2.Dockerfile b/dockerfiles/cuda_4.3.2.Dockerfile
@@ -11,7 +11,9 @@ ENV TZ=Etc/UTC
 ENV NVBLAS_CONFIG_FILE=/etc/nvblas.conf
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PATH}:${CUDA_HOME}/bin
+ENV PURGE_BUILDDEPS=false
+ENV VIRTUAL_ENV=/opt/venv
+ENV PATH=${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin
 
 COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh
 

diff --git a/dockerfiles/cuda_devel.Dockerfile b/dockerfiles/cuda_devel.Dockerfile
@@ -11,7 +11,9 @@ ENV TZ=Etc/UTC
 ENV NVBLAS_CONFIG_FILE=/etc/nvblas.conf
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PATH}:${CUDA_HOME}/bin
+ENV PURGE_BUILDDEPS=false
+ENV VIRTUAL_ENV=/opt/venv
+ENV PATH=${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin
 
 COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh
 

diff --git a/dockerfiles/geospatial-dev-osgeo_4.3.2.Dockerfile b/dockerfiles/geospatial-dev-osgeo_4.3.2.Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <[email protected]>"
 
 ENV PROJ_VERSION=9.3.1
-ENV GDAL_VERSION=3.8.2
+ENV GDAL_VERSION=3.8.3
 ENV GEOS_VERSION=3.12.1
 
 COPY scripts/experimental/install_dev_osgeo.sh /rocker_scripts/experimental/install_dev_osgeo.sh