From f15c18890470203d2d91d0204c65767011275eb6 Mon Sep 17 00:00:00 2001 From: Carl Date: Fri, 22 Dec 2023 19:49:12 -0800 Subject: [PATCH 01/11] patch/cuda --- scripts/setup_R.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/setup_R.sh b/scripts/setup_R.sh index d90abb52..df02a859 100755 --- a/scripts/setup_R.sh +++ b/scripts/setup_R.sh @@ -43,6 +43,8 @@ cat <>"${R_HOME}/etc/Rprofile.site" options(HTTPUserAgent = sprintf("R/%s R (%s)", getRversion(), paste(getRversion(), R.version["platform"], R.version["arch"], R.version["os"]))) EOF + + ## Install OpenBLAS and hot-switching to it ## https://github.com/rocker-org/rocker-versioned2/issues/390 if ! dpkg -l | grep -q libopenblas-dev; then @@ -68,7 +70,7 @@ if [ ! -x "$(command -v r)" ]; then # Clean up # shellcheck disable=SC2086 - apt-get remove --purge -y ${BUILDDEPS} + # apt-get remove --purge -y ${BUILDDEPS} apt-get autoremove -y apt-get autoclean -y fi From 54a4a097c0a0ee79d3c7f810891b243e540bae0e Mon Sep 17 00:00:00 2001 From: Carl Date: Thu, 4 Jan 2024 19:21:08 -0800 Subject: [PATCH 02/11] install_R_deps as seperate method --- scripts/install_R_deps.sh | 62 +++++++++++++++++++++++++++++++++++++++ scripts/setup_R.sh | 2 +- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100755 scripts/install_R_deps.sh diff --git a/scripts/install_R_deps.sh b/scripts/install_R_deps.sh new file mode 100755 index 00000000..2ec1c144 --- /dev/null +++ b/scripts/install_R_deps.sh @@ -0,0 +1,62 @@ +#!/bin/bash + + +set -e + +R_VERSION=${1:-${R_VERSION:-"latest"}} + +# shellcheck source=/dev/null +source /etc/os-release + +apt-get update +apt-get -y install locales + +## Configure default locale +LANG=${LANG:-"en_US.UTF-8"} +/usr/sbin/locale-gen --lang "${LANG}" +/usr/sbin/update-locale --reset LANG="${LANG}" + +export DEBIAN_FRONTEND=noninteractive + +R_HOME=${R_HOME:-"/usr/local/lib/R"} + +READLINE_VERSION=8 +if [ "${UBUNTU_CODENAME}" == "bionic" ]; then + READLINE_VERSION=7 +fi + +apt-get install -y --no-install-recommends \ + bash-completion \ + ca-certificates \ + file \ + fonts-texgyre \ + g++ \ + gfortran \ + gsfonts \ + libblas-dev \ + libbz2-* \ + libcurl4 \ + "libicu[0-9][0-9]" \ + liblapack-dev \ + libpcre2* \ + libjpeg-turbo* \ + libpangocairo-* \ + libpng16* \ + "libreadline${READLINE_VERSION}" \ + libtiff* \ + liblzma* \ + make \ + tzdata \ + unzip \ + zip \ + zlib1g + + +mkdir -p "${R_HOME}/site-library" +chown root:staff "${R_HOME}/site-library" +chmod g+ws "${R_HOME}/site-library" +echo "R_LIBS=\${R_LIBS-'${R_HOME}/site-library:${R_HOME}/library'}" >>"${R_HOME}/etc/Renviron.site" + +echo "PATH=${PATH}" >>"${R_HOME}/etc/Renviron.site" + + diff --git a/scripts/setup_R.sh b/scripts/setup_R.sh index df02a859..cba9a35f 100755 --- a/scripts/setup_R.sh +++ b/scripts/setup_R.sh @@ -70,7 +70,7 @@ if [ ! -x "$(command -v r)" ]; then # Clean up # shellcheck disable=SC2086 - # apt-get remove --purge -y ${BUILDDEPS} + apt-get remove --purge -y ${BUILDDEPS} apt-get autoremove -y apt-get autoclean -y fi From c06a08613edfae5020157ae4855bdd55431541a7 Mon Sep 17 00:00:00 2001 From: Carl Date: Tue, 16 Jan 2024 11:27:06 -0800 Subject: [PATCH 03/11] try 2 --- scripts/install_R_deps.sh | 62 --------------------------------------- scripts/setup_R.sh | 2 -- 2 files changed, 64 deletions(-) delete mode 100755 scripts/install_R_deps.sh diff --git a/scripts/install_R_deps.sh b/scripts/install_R_deps.sh deleted file mode 100755 index 2ec1c144..00000000 --- a/scripts/install_R_deps.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - - -set -e - -R_VERSION=${1:-${R_VERSION:-"latest"}} - -# shellcheck source=/dev/null -source /etc/os-release - -apt-get update -apt-get -y install locales - -## Configure default locale -LANG=${LANG:-"en_US.UTF-8"} -/usr/sbin/locale-gen --lang "${LANG}" -/usr/sbin/update-locale --reset LANG="${LANG}" - -export DEBIAN_FRONTEND=noninteractive - -R_HOME=${R_HOME:-"/usr/local/lib/R"} - -READLINE_VERSION=8 -if [ "${UBUNTU_CODENAME}" == "bionic" ]; then - READLINE_VERSION=7 -fi - -apt-get install -y --no-install-recommends \ - bash-completion \ - ca-certificates \ - file \ - fonts-texgyre \ - g++ \ - gfortran \ - gsfonts \ - libblas-dev \ - libbz2-* \ - libcurl4 \ - "libicu[0-9][0-9]" \ - liblapack-dev \ - libpcre2* \ - libjpeg-turbo* \ - libpangocairo-* \ - libpng16* \ - "libreadline${READLINE_VERSION}" \ - libtiff* \ - liblzma* \ - make \ - tzdata \ - unzip \ - zip \ - zlib1g - - -mkdir -p "${R_HOME}/site-library" -chown root:staff "${R_HOME}/site-library" -chmod g+ws "${R_HOME}/site-library" -echo "R_LIBS=\${R_LIBS-'${R_HOME}/site-library:${R_HOME}/library'}" >>"${R_HOME}/etc/Renviron.site" - -echo "PATH=${PATH}" >>"${R_HOME}/etc/Renviron.site" - - diff --git a/scripts/setup_R.sh b/scripts/setup_R.sh index cba9a35f..d90abb52 100755 --- a/scripts/setup_R.sh +++ b/scripts/setup_R.sh @@ -43,8 +43,6 @@ cat <>"${R_HOME}/etc/Rprofile.site" options(HTTPUserAgent = sprintf("R/%s R (%s)", getRversion(), paste(getRversion(), R.version["platform"], R.version["arch"], R.version["os"]))) EOF - - ## Install OpenBLAS and hot-switching to it ## https://github.com/rocker-org/rocker-versioned2/issues/390 if ! dpkg -l | grep -q libopenblas-dev; then From c1c7b0ee37d0ed09a4c28bd8d58bddfb36704b35 Mon Sep 17 00:00:00 2001 From: Carl Date: Tue, 16 Jan 2024 11:39:52 -0800 Subject: [PATCH 04/11] simpler mechanism --- scripts/install_R_source.sh | 5 ++++- scripts/setup_R.sh | 5 ++++- stacks/4.3.2.json | 1 + stacks/devel.json | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/install_R_source.sh b/scripts/install_R_source.sh index d6e4e3f2..7a1d6cca 100755 --- a/scripts/install_R_source.sh +++ b/scripts/install_R_source.sh @@ -11,6 +11,7 @@ set -e R_VERSION=${1:-${R_VERSION:-"latest"}} +PURGE_BUILDDEPS=${PURGE_BUILDDEPS=-"TRUE"} # shellcheck source=/dev/null source /etc/os-release @@ -157,7 +158,9 @@ rm -rf "R.tar.gz" cp /usr/bin/checkbashisms /usr/local/bin/checkbashisms # shellcheck disable=SC2086 -apt-get remove --purge -y ${BUILDDEPS} +if [ "${PURGE_BUILDDEPS}" == "TRUE" ]; then + apt-get remove --purge -y ${BUILDDEPS} +fi apt-get autoremove -y apt-get autoclean -y rm -rf /var/lib/apt/lists/* diff --git a/scripts/setup_R.sh b/scripts/setup_R.sh index d90abb52..1bb127e5 100755 --- a/scripts/setup_R.sh +++ b/scripts/setup_R.sh @@ -10,6 +10,7 @@ set -e CRAN=${1:-${CRAN:-"https://cran.r-project.org"}} +PURGE_BUILDDEPS=${PURGE_BUILDDEPS=-"TRUE"} ARCH=$(uname -m) @@ -68,7 +69,9 @@ if [ ! -x "$(command -v r)" ]; then # Clean up # shellcheck disable=SC2086 - apt-get remove --purge -y ${BUILDDEPS} + if [ "${PURGE_BUILDDEPS}" == "TRUE" ]; then + apt-get remove --purge -y ${BUILDDEPS} + fi apt-get autoremove -y apt-get autoclean -y fi diff --git a/stacks/4.3.2.json b/stacks/4.3.2.json index 5c0ceb77..7466b5e8 100644 --- a/stacks/4.3.2.json +++ b/stacks/4.3.2.json @@ -257,6 +257,7 @@ "NVBLAS_CONFIG_FILE": "/etc/nvblas.conf", "PYTHON_CONFIGURE_OPTS": "--enable-shared", "RETICULATE_AUTOCONFIGURE": "0", + "PURGE_BUILDDEPS": "FALSE", "PATH": "${PATH}:${CUDA_HOME}/bin" }, "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", diff --git a/stacks/devel.json b/stacks/devel.json index 8637af99..42fb454c 100644 --- a/stacks/devel.json +++ b/stacks/devel.json @@ -148,7 +148,7 @@ "org.opencontainers.image.title": "rocker/cuda", "org.opencontainers.image.description": "NVIDIA CUDA libraries added to Rocker image." }, - "FROM": "nvidia/cuda:11.8.0-cudnn8-devel-ubuntu24.04", + "FROM": "nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", "ENV": { "R_VERSION": "devel", "R_HOME": "/usr/local/lib/R", @@ -156,6 +156,7 @@ "NVBLAS_CONFIG_FILE": "/etc/nvblas.conf", "PYTHON_CONFIGURE_OPTS": "--enable-shared", "RETICULATE_AUTOCONFIGURE": "0", + "PURGE_BUILDDEPS": "FALSE", "PATH": "${PATH}:${CUDA_HOME}/bin" }, "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", From 768598c58b5694aef9e89bb47b129eb78933a0b9 Mon Sep 17 00:00:00 2001 From: Carl Date: Tue, 16 Jan 2024 12:19:04 -0800 Subject: [PATCH 05/11] need /opt/venv on PATH --- stacks/4.3.2.json | 3 ++- stacks/devel.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stacks/4.3.2.json b/stacks/4.3.2.json index 7466b5e8..2e810e6b 100644 --- a/stacks/4.3.2.json +++ b/stacks/4.3.2.json @@ -258,7 +258,8 @@ "PYTHON_CONFIGURE_OPTS": "--enable-shared", "RETICULATE_AUTOCONFIGURE": "0", "PURGE_BUILDDEPS": "FALSE", - "PATH": "${PATH}:${CUDA_HOME}/bin" + "VIRUTAL_ENV": "/opt/venv", + "PATH": "${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin" }, "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", "RUN_a_script": "/rocker_scripts/install_R_source.sh", diff --git a/stacks/devel.json b/stacks/devel.json index 42fb454c..c387f251 100644 --- a/stacks/devel.json +++ b/stacks/devel.json @@ -157,7 +157,8 @@ "PYTHON_CONFIGURE_OPTS": "--enable-shared", "RETICULATE_AUTOCONFIGURE": "0", "PURGE_BUILDDEPS": "FALSE", - "PATH": "${PATH}:${CUDA_HOME}/bin" + "VIRUTAL_ENV": "/opt/venv", + "PATH": "${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin" }, "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", "RUN_a_script": "/rocker_scripts/install_R_source.sh", From dd05a7cbb98455df6ff91965a998405ec01db429 Mon Sep 17 00:00:00 2001 From: Carl Date: Tue, 16 Jan 2024 15:42:54 -0800 Subject: [PATCH 06/11] recursive group permissions --- scripts/install_python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_python.sh b/scripts/install_python.sh index a2add4da..9f2865da 100755 --- a/scripts/install_python.sh +++ b/scripts/install_python.sh @@ -41,7 +41,7 @@ python3 -m pip --no-cache-dir install --upgrade \ # Make the venv owned by the staff group, so users can install packages # without having to be root chown -R root:staff "${VIRTUAL_ENV}" -chmod g+ws "${VIRTUAL_ENV}" +chmod -R g+ws "${VIRTUAL_ENV}" install2.r --error --skipmissing --skipinstalled -n "$NCPUS" reticulate From a19206cfc93dfe42cd8130320e0ace44617588ca Mon Sep 17 00:00:00 2001 From: Carl Date: Wed, 17 Jan 2024 12:24:12 -0800 Subject: [PATCH 07/11] fix typos (thanks @noamross) --- stacks/4.3.2.json | 2 +- stacks/devel.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stacks/4.3.2.json b/stacks/4.3.2.json index 2e810e6b..f83d0f77 100644 --- a/stacks/4.3.2.json +++ b/stacks/4.3.2.json @@ -258,7 +258,7 @@ "PYTHON_CONFIGURE_OPTS": "--enable-shared", "RETICULATE_AUTOCONFIGURE": "0", "PURGE_BUILDDEPS": "FALSE", - "VIRUTAL_ENV": "/opt/venv", + "VIRTUAL_ENV": "/opt/venv", "PATH": "${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin" }, "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", diff --git a/stacks/devel.json b/stacks/devel.json index c387f251..84adc180 100644 --- a/stacks/devel.json +++ b/stacks/devel.json @@ -157,7 +157,7 @@ "PYTHON_CONFIGURE_OPTS": "--enable-shared", "RETICULATE_AUTOCONFIGURE": "0", "PURGE_BUILDDEPS": "FALSE", - "VIRUTAL_ENV": "/opt/venv", + "VIRTUAL_ENV": "/opt/venv", "PATH": "${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin" }, "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", From 02951ef29dfd8b03f49818dd1b074f8ce7913df3 Mon Sep 17 00:00:00 2001 From: Carl Date: Fri, 19 Jan 2024 10:49:55 -0800 Subject: [PATCH 08/11] use lowercase --- scripts/install_R_source.sh | 4 ++-- scripts/setup_R.sh | 4 ++-- stacks/4.3.2.json | 2 +- stacks/devel.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install_R_source.sh b/scripts/install_R_source.sh index 7a1d6cca..bbc6b6b5 100755 --- a/scripts/install_R_source.sh +++ b/scripts/install_R_source.sh @@ -11,7 +11,7 @@ set -e R_VERSION=${1:-${R_VERSION:-"latest"}} -PURGE_BUILDDEPS=${PURGE_BUILDDEPS=-"TRUE"} +PURGE_BUILDDEPS=${PURGE_BUILDDEPS=-"true"} # shellcheck source=/dev/null source /etc/os-release @@ -158,7 +158,7 @@ rm -rf "R.tar.gz" cp /usr/bin/checkbashisms /usr/local/bin/checkbashisms # shellcheck disable=SC2086 -if [ "${PURGE_BUILDDEPS}" == "TRUE" ]; then +if [ "${PURGE_BUILDDEPS}" == "true" ]; then apt-get remove --purge -y ${BUILDDEPS} fi apt-get autoremove -y diff --git a/scripts/setup_R.sh b/scripts/setup_R.sh index 1bb127e5..5b7bc0b2 100755 --- a/scripts/setup_R.sh +++ b/scripts/setup_R.sh @@ -10,7 +10,7 @@ set -e CRAN=${1:-${CRAN:-"https://cran.r-project.org"}} -PURGE_BUILDDEPS=${PURGE_BUILDDEPS=-"TRUE"} +PURGE_BUILDDEPS=${PURGE_BUILDDEPS=-"true"} ARCH=$(uname -m) @@ -69,7 +69,7 @@ if [ ! -x "$(command -v r)" ]; then # Clean up # shellcheck disable=SC2086 - if [ "${PURGE_BUILDDEPS}" == "TRUE" ]; then + if [ "${PURGE_BUILDDEPS}" == "true" ]; then apt-get remove --purge -y ${BUILDDEPS} fi apt-get autoremove -y diff --git a/stacks/4.3.2.json b/stacks/4.3.2.json index f83d0f77..33dc8e68 100644 --- a/stacks/4.3.2.json +++ b/stacks/4.3.2.json @@ -257,7 +257,7 @@ "NVBLAS_CONFIG_FILE": "/etc/nvblas.conf", "PYTHON_CONFIGURE_OPTS": "--enable-shared", "RETICULATE_AUTOCONFIGURE": "0", - "PURGE_BUILDDEPS": "FALSE", + "PURGE_BUILDDEPS": "false", "VIRTUAL_ENV": "/opt/venv", "PATH": "${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin" }, diff --git a/stacks/devel.json b/stacks/devel.json index 84adc180..bd12f55d 100644 --- a/stacks/devel.json +++ b/stacks/devel.json @@ -156,7 +156,7 @@ "NVBLAS_CONFIG_FILE": "/etc/nvblas.conf", "PYTHON_CONFIGURE_OPTS": "--enable-shared", "RETICULATE_AUTOCONFIGURE": "0", - "PURGE_BUILDDEPS": "FALSE", + "PURGE_BUILDDEPS": "false", "VIRTUAL_ENV": "/opt/venv", "PATH": "${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin" }, From 038208236f4c646bbfa0a957ffcc0e2c9b21e707 Mon Sep 17 00:00:00 2001 From: Carl Date: Fri, 19 Jan 2024 22:20:22 -0800 Subject: [PATCH 09/11] run build/make-stacks.R --- stacks/devel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks/devel.json b/stacks/devel.json index bd12f55d..b58bd3e1 100644 --- a/stacks/devel.json +++ b/stacks/devel.json @@ -148,7 +148,7 @@ "org.opencontainers.image.title": "rocker/cuda", "org.opencontainers.image.description": "NVIDIA CUDA libraries added to Rocker image." }, - "FROM": "nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", + "FROM": "nvidia/cuda:11.8.0-cudnn8-devel-ubuntu24.04", "ENV": { "R_VERSION": "devel", "R_HOME": "/usr/local/lib/R", From bba4a6e70922230cd8e70482b054e931796014c4 Mon Sep 17 00:00:00 2001 From: Carl Date: Mon, 22 Jan 2024 20:30:13 -0800 Subject: [PATCH 10/11] 4 spaces --- scripts/install_R_source.sh | 2 +- scripts/setup_R.sh | 2 +- stacks/4.3.1.json | 4 +++- stacks/extra.json | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/install_R_source.sh b/scripts/install_R_source.sh index bbc6b6b5..9bedb5b1 100755 --- a/scripts/install_R_source.sh +++ b/scripts/install_R_source.sh @@ -159,7 +159,7 @@ cp /usr/bin/checkbashisms /usr/local/bin/checkbashisms # shellcheck disable=SC2086 if [ "${PURGE_BUILDDEPS}" == "true" ]; then - apt-get remove --purge -y ${BUILDDEPS} + apt-get remove --purge -y ${BUILDDEPS} fi apt-get autoremove -y apt-get autoclean -y diff --git a/scripts/setup_R.sh b/scripts/setup_R.sh index 5b7bc0b2..9c68cc7c 100755 --- a/scripts/setup_R.sh +++ b/scripts/setup_R.sh @@ -70,7 +70,7 @@ if [ ! -x "$(command -v r)" ]; then # Clean up # shellcheck disable=SC2086 if [ "${PURGE_BUILDDEPS}" == "true" ]; then - apt-get remove --purge -y ${BUILDDEPS} + apt-get remove --purge -y ${BUILDDEPS} fi apt-get autoremove -y apt-get autoclean -y diff --git a/stacks/4.3.1.json b/stacks/4.3.1.json index c81af409..6d419ef6 100644 --- a/stacks/4.3.1.json +++ b/stacks/4.3.1.json @@ -203,7 +203,9 @@ "NVBLAS_CONFIG_FILE": "/etc/nvblas.conf", "PYTHON_CONFIGURE_OPTS": "--enable-shared", "RETICULATE_AUTOCONFIGURE": "0", - "PATH": "${PATH}:${CUDA_HOME}/bin" + "PURGE_BUILDDEPS": "false", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin" }, "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", "RUN_a_script": "/rocker_scripts/install_R_source.sh", diff --git a/stacks/extra.json b/stacks/extra.json index 0a182449..b2f32e7c 100644 --- a/stacks/extra.json +++ b/stacks/extra.json @@ -58,7 +58,7 @@ "FROM": "rocker/verse:4.3.2", "ENV": { "PROJ_VERSION": "9.3.1", - "GDAL_VERSION": "3.8.2", + "GDAL_VERSION": "3.8.3", "GEOS_VERSION": "3.12.1" }, "COPY": "scripts/experimental/install_dev_osgeo.sh /rocker_scripts/experimental/install_dev_osgeo.sh", From 18d9dafd729ffb8532d547c53c2f13283c5400bf Mon Sep 17 00:00:00 2001 From: Carl Date: Mon, 22 Jan 2024 20:37:25 -0800 Subject: [PATCH 11/11] update dockerfiles, run remaining build scripts --- dockerfiles/cuda_4.3.1.Dockerfile | 4 +++- dockerfiles/cuda_4.3.2.Dockerfile | 4 +++- dockerfiles/cuda_devel.Dockerfile | 4 +++- dockerfiles/geospatial-dev-osgeo_4.3.2.Dockerfile | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dockerfiles/cuda_4.3.1.Dockerfile b/dockerfiles/cuda_4.3.1.Dockerfile index 52516dc9..6bb5fdfc 100644 --- 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 index 92861572..2a49c457 100644 --- 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 index dfafe70e..75eb0dcf 100644 --- 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 index 63b73b61..8c9e6d13 100644 --- 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 " 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