#1009: Removed NVIDIA GPU Driver Libraries from template-CUDA SLC (#475)

related to exasol/script-languages-release#1009
exasol · Nov 13, 2024 · 4fb575c · 4fb575c
1 parent ba95158
commit 4fb575c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 85 deletions.
diff --git a/ext/scripts/install_scripts/install_nvidia_driver_libs.sh b/ext/scripts/install_scripts/install_nvidia_driver_libs.sh
diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/FLAVOR_DESCRIPTION.md b/flavors/template-Exasol-all-python-3.10-cuda-conda/FLAVOR_DESCRIPTION.md
@@ -4,7 +4,6 @@
 
 **Remarks:** The packages are grouped by there main usage and their type.
 
-- [NVIDIA Driver dependencies](flavor_base/nvidia_driver_deps/packages/apt_get_packages)
 - UDFclient dependencies
   - [Conda Packages](flavor_base/udfclient_deps/packages/conda_packages)
   - [Conda Channels](flavor_base/udfclient_deps/packages/conda_channels)

diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_steps.py b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_steps.py
@@ -3,17 +3,6 @@
 from exasol.slc.internal.tasks.build.docker_flavor_image_task import (DockerFlavorAnalyzeImageTask)
 
 
-class AnalyzeNVidiaDriverDeps(DockerFlavorAnalyzeImageTask):
-
-    def get_build_step(self) -> str:
-        return "nvidia_driver_deps"
-
-    def get_additional_build_directories_mapping(self) -> Dict[str, str]:
-        return {"01_nodoc": "ext/01_nodoc", "scripts": "ext/scripts"}
-
-    def get_path_in_flavor(self):
-        return "flavor_base"
-
 class AnalyzeCondaDeps(DockerFlavorAnalyzeImageTask):
 
     def get_build_step(self) -> str:
@@ -25,9 +14,6 @@ def get_additional_build_directories_mapping(self) -> Dict[str, str]:
     def get_path_in_flavor(self):
         return "flavor_base"
 
-    def requires_tasks(self):
-        return {"nvidia_driver_deps": AnalyzeNVidiaDriverDeps}
-
 class AnalyzeUDFClientDeps(DockerFlavorAnalyzeImageTask):
 
     def get_build_step(self) -> str:

diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/conda_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/conda_deps/Dockerfile
@@ -1,4 +1,16 @@
-FROM {{ nvidia_driver_deps }}
+FROM ubuntu:22.04
+ENV DEBIAN_FRONTEND=noninteractive
+
+ENV ARCHIVE_UBUNTU_PREFIX=""
+RUN sed --in-place --regexp-extended "s/(\/\/)(archive\.ubuntu)/\1$ARCHIVE_UBUNTU_PREFIX\2/" /etc/apt/sources.list
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+
+COPY scripts /scripts
+
+RUN mkdir -p /build_info/packages
+COPY conda_deps/packages /build_info/packages/conda_deps
+RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/conda_deps/apt_get_packages --with-versions
 
 ENV ENV_NAME="base"
 ENV MAMBA_ROOT_PREFIX="/opt/conda"
@@ -7,16 +19,15 @@ ENV MAMBA_DOCKERFILE_ACTIVATE=1
 
 COPY conda_deps/_activate_current_env.sh /usr/local/bin/_activate_current_env.sh
 
-SHELL ["/bin/bash", "-l", "-c"]
-ENV MICROMAMBA_VERSION=0.24.0
-RUN /scripts/install_scripts/install_micromamba.sh "$MICROMAMBA_VERSION"
-
 RUN addgroup --gid 1000 exasolution
 RUN adduser --disabled-login --uid 1000 --gid 1000 exasolution --gecos "First Last,RoomNumber,WorkPhone,HomePhone"
-RUN addgroup --gid 500 exausers 
+RUN addgroup --gid 500 exausers
 RUN adduser --disabled-login --uid 500 --gid 500 exadefusr --gecos "First Last,RoomNumber,WorkPhone,HomePhone"
 
+SHELL ["/bin/bash", "-l", "-c"]
+ENV MICROMAMBA_VERSION=0.24.0
+RUN /scripts/install_scripts/install_micromamba.sh "$MICROMAMBA_VERSION"
+
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
+ENV LC_ALL en_US.UTF-8
diff --git a/...dia_driver_deps/packages/apt_get_packages → ...base/conda_deps/packages/apt_get_packages b/...dia_driver_deps/packages/apt_get_packages → ...base/conda_deps/packages/apt_get_packages
diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/nvidia_driver_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/nvidia_driver_deps/Dockerfile