Skip to content
Snippets Groups Projects
Verified Commit d23224ff authored by Olivier Benz's avatar Olivier Benz
Browse files

base: Minor refactoring

- Set NVIDIA environment variables for MAX image only
- Update LABELs and point to correct image source URL
parent 9fa51ef9
No related branches found
No related tags found
No related merge requests found
...@@ -17,6 +17,9 @@ ARG GIT_VERSION=2.47.1 ...@@ -17,6 +17,9 @@ ARG GIT_VERSION=2.47.1
ARG GIT_LFS_VERSION=3.6.0 ARG GIT_LFS_VERSION=3.6.0
ARG PANDOC_VERSION=3.4 ARG PANDOC_VERSION=3.4
ARG INSTALL_MAX
ARG BASE_SELECT=${INSTALL_MAX:+max}
FROM ${BUILD_ON_IMAGE}${PYTHON_VERSION:+:}${PYTHON_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR} AS files FROM ${BUILD_ON_IMAGE}${PYTHON_VERSION:+:}${PYTHON_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR} AS files
ARG NB_UID ARG NB_UID
...@@ -62,13 +65,22 @@ FROM glcr.b-data.ch/neovim/nvsi:${NEOVIM_VERSION} AS nvsi ...@@ -62,13 +65,22 @@ FROM glcr.b-data.ch/neovim/nvsi:${NEOVIM_VERSION} AS nvsi
FROM glcr.b-data.ch/git/gsi/${GIT_VERSION}/${BASE_IMAGE}:${BASE_IMAGE_TAG} AS gsi FROM glcr.b-data.ch/git/gsi/${GIT_VERSION}/${BASE_IMAGE}:${BASE_IMAGE_TAG} AS gsi
FROM glcr.b-data.ch/git-lfs/glfsi:${GIT_LFS_VERSION} AS glfsi FROM glcr.b-data.ch/git-lfs/glfsi:${GIT_LFS_VERSION} AS glfsi
FROM ${BUILD_ON_IMAGE}${PYTHON_VERSION:+:}${PYTHON_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR} as base FROM ${BUILD_ON_IMAGE}${PYTHON_VERSION:+:}${PYTHON_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR} AS base-max
## For use with the NVIDIA Container Runtime
ENV NVIDIA_VISIBLE_DEVICES=all
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
FROM ${BUILD_ON_IMAGE}${PYTHON_VERSION:+:}${PYTHON_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR} AS base-mojo
FROM base-${BASE_SELECT:-mojo} AS base
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG BUILD_ON_IMAGE ARG BUILD_ON_IMAGE
ARG MOJO_VERSION ARG MOJO_VERSION
ARG CUDA_IMAGE_FLAVOR ARG CUDA_IMAGE_FLAVOR
ARG NB_USER ARG NB_USER
ARG NB_UID ARG NB_UID
ARG JUPYTERHUB_VERSION ARG JUPYTERHUB_VERSION
...@@ -84,7 +96,7 @@ ARG CODE_WORKDIR ...@@ -84,7 +96,7 @@ ARG CODE_WORKDIR
ARG CUDA_IMAGE_LICENSE=${CUDA_VERSION:+"NVIDIA Deep Learning Container License"} ARG CUDA_IMAGE_LICENSE=${CUDA_VERSION:+"NVIDIA Deep Learning Container License"}
ARG IMAGE_LICENSE=${CUDA_IMAGE_LICENSE:-"MIT"} ARG IMAGE_LICENSE=${CUDA_IMAGE_LICENSE:-"MIT"}
ARG IMAGE_SOURCE=https://gitlab.b-data.ch/jupyterlab/python/docker-stack ARG IMAGE_SOURCE=https://gitlab.b-data.ch/jupyterlab/mojo/docker-stack
ARG IMAGE_VENDOR="b-data GmbH" ARG IMAGE_VENDOR="b-data GmbH"
ARG IMAGE_AUTHORS="Olivier Benz <olivier.benz@b-data.ch>" ARG IMAGE_AUTHORS="Olivier Benz <olivier.benz@b-data.ch>"
...@@ -529,7 +541,3 @@ CMD ["start-notebook.sh"] ...@@ -529,7 +541,3 @@ CMD ["start-notebook.sh"]
ARG BUILD_START ARG BUILD_START
ENV BUILD_DATE=${BUILD_START} ENV BUILD_DATE=${BUILD_START}
## For use with the NVIDIA Container Runtime
ENV NVIDIA_VISIBLE_DEVICES=all
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment