Skip to content

Commit fecda9f

Browse files
committed
Update all the python packages on the jupyter notebooks as well as the dockerfile on the cuda layer
Remove jupyterlab-s3-browser from datascience notebook Add skl2onnx, codeflare-sdk, pymongo, psycopg, mysql-connector-python, pyodbc python packages on the jupyter notebooks except minimal Install unixODBC in favor of pyodbc package Install cuda toolkit on c9s cuda base Update runtimes' python packages Upgrade packages on the ubi8 flavor of the notebooks Move installation of usefull os packages like jq unixODBC postgreql git-lfs libsndfile on the base image Upgrade packages on trustyAI ubi8 Add mongodb and mssql drivers on datascience notebook Consider setuptool on the pipfiles of the notebooks
1 parent 57b8252 commit fecda9f

File tree

50 files changed

+26824
-9222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+26824
-9222
lines changed

base/c9s-python-3.9/Pipfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ verify_ssl = true
66
[dev-packages]
77

88
[packages]
9-
wheel = "~=0.38.4"
9+
# Base packages
10+
wheel = "~=0.41.2"
11+
setuptools = "~=68.1.2"
1012

1113
[requires]
1214
python_version = "3.9"

base/c9s-python-3.9/Pipfile.lock

Lines changed: 12 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

base/ubi8-python-3.8/Pipfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ verify_ssl = true
66
[dev-packages]
77

88
[packages]
9-
wheel = "~=0.38.4"
9+
# Base packages
10+
wheel = "~=0.41.2"
11+
setuptools = "~=68.1.2"
1012

1113
[requires]
1214
python_version = "3.8"

base/ubi8-python-3.8/Pipfile.lock

Lines changed: 12 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

base/ubi9-python-3.9/Pipfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ verify_ssl = true
66
[dev-packages]
77

88
[packages]
9-
wheel = "~=0.38.4"
9+
# Base packages
10+
wheel = "~=0.41.2"
11+
setuptools = "~=68.1.2"
1012

1113
[requires]
1214
python_version = "3.9"

base/ubi9-python-3.9/Pipfile.lock

Lines changed: 12 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

codeserver/c9s-python-3.9/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG BASE_IMAGE
22
FROM ${BASE_IMAGE}
33

4-
ARG CODESERVER_VERSION=v4.11.0
4+
ARG CODESERVER_VERSION=v4.16.1
55

66
LABEL name="odh-notebook-code-server-c9s-python-3.9" \
77
summary="Code Server (VS Code) image with python 3.9 based on CentOS Stream 9" \
@@ -22,8 +22,8 @@ RUN yum install -y "https://github.com/coder/code-server/releases/download/${COD
2222
yum -y clean all --enablerepo='*'
2323

2424
# Install NGINX to proxy VSCode and pass probes check
25-
ENV NGINX_VERSION=1.20 \
26-
NGINX_SHORT_VER=120 \
25+
ENV NGINX_VERSION=1.22 \
26+
NGINX_SHORT_VER=122 \
2727
NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
2828
NGINX_CONF_PATH=/etc/nginx/nginx.conf \
2929
NGINX_DEFAULT_CONF_PATH=${APP_ROOT}/etc/nginx.default.d \
@@ -34,7 +34,7 @@ ENV NGINX_VERSION=1.20 \
3434

3535
# Modules does not exist
3636
RUN yum install -y https://download.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
37-
INSTALL_PKGS="nss_wrapper bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl fcgiwrap initscripts chkconfig" && \
37+
INSTALL_PKGS="bind-utils nginx nginx-mod-stream nginx-mod-http-perl fcgiwrap initscripts chkconfig" && \
3838
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
3939
rpm -V $INSTALL_PKGS && \
4040
# spawn-fcgi is not in epel9 \
@@ -77,7 +77,6 @@ COPY nginx/serverconf/ /opt/app-root/etc/nginx.default.d/
7777
COPY nginx/httpconf/ /opt/app-root/etc/nginx.d/
7878
COPY nginx/api/ /opt/app-root/api/
7979

80-
8180
# Launcher
8281
COPY utils utils/
8382
COPY run-code-server.sh run-nginx.sh ./

codeserver/c9s-python-3.9/run-code-server.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ source ${SCRIPT_DIR}/utils/*.sh
88
run-nginx.sh &
99
spawn-fcgi -s /var/run/fcgiwrap.socket -M 766 /usr/sbin/fcgiwrap
1010

11-
# Create .bashrc if not present
12-
if [ ! -f /opt/app-root/src/.bashrc ]
13-
then
14-
touch /opt/app-root/src/.bashrc
11+
# Add .bashrc for custom promt if not present
12+
if [ ! -f "/opt/app-root/src/.bashrc" ]; then
13+
echo 'PS1="\[\033[34;1m\][\$(pwd)]\[\033[0m\]\n\[\033[1;0m\]$ \[\033[0m\]"' > /opt/app-root/src/.bashrc
1514
fi
1615

1716
# Initilize access logs for culling
@@ -23,4 +22,4 @@ start_process /usr/bin/code-server \
2322
--disable-telemetry \
2423
--auth none \
2524
--disable-update-check \
26-
/opt/app-root/src
25+
/opt/app-root/src

cuda/c9s-python-3.9/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ USER 0
1717
WORKDIR /opt/app-root/bin
1818

1919
ENV NVARCH x86_64
20-
ENV NVIDIA_REQUIRE_CUDA "cuda>=11.8 brand=tesla,driver>=450,driver<451 brand=tesla,driver>=470,driver<471 brand=unknown,driver>=470,driver<471 brand=nvidia,driver>=470,driver<471 brand=nvidiartx,driver>=470,driver<471 brand=geforce,driver>=470,driver<471 brand=geforcertx,driver>=470,driver<471 brand=quadro,driver>=470,driver<471 brand=quadrortx,driver>=470,driver<471 brand=titan,driver>=470,driver<471 brand=titanrtx,driver>=470,driver<471 brand=tesla,driver>=510,driver<511 brand=unknown,driver>=510,driver<511 brand=nvidia,driver>=510,driver<511 brand=nvidiartx,driver>=510,driver<511 brand=geforce,driver>=510,driver<511 brand=geforcertx,driver>=510,driver<511 brand=quadro,driver>=510,driver<511 brand=quadrortx,driver>=510,driver<511 brand=titan,driver>=510,driver<511 brand=titanrtx,driver>=510,driver<511 brand=tesla,driver>=515,driver<516 brand=unknown,driver>=515,driver<516 brand=nvidia,driver>=515,driver<516 brand=nvidiartx,driver>=515,driver<516 brand=geforce,driver>=515,driver<516 brand=geforcertx,driver>=515,driver<516 brand=quadro,driver>=515,driver<516 brand=quadrortx,driver>=515,driver<516 brand=titan,driver>=515,driver<516 brand=titanrtx,driver>=515,driver<516"
20+
ENV NVIDIA_REQUIRE_CUDA "cuda>=11.8 brand=tesla,driver>=450,driver<451 brand=tesla,driver>=470,driver<471 brand=unknown,driver>=470,driver<471 brand=nvidia,driver>=470,driver<471 brand=nvidiartx,driver>=470,driver<471 brand=geforce,driver>=470,driver<471 brand=geforcertx,driver>=470,driver<471 brand=quadro,driver>=470,driver<471 brand=quadrortx,driver>=470,driver<471 brand=titan,driver>=470,driver<471 brand=titanrtx,driver>=470,driver<471"
2121
ENV NV_CUDA_CUDART_VERSION 11.8.89-1
2222

2323
COPY cuda.repo-x86_64 /etc/yum.repos.d/cuda.repo
@@ -103,7 +103,7 @@ ENV LIBRARY_PATH /usr/local/cuda/lib64/stubs
103103

104104
# Install CUDA devel cudnn8 from:
105105
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.8.0/ubi8/devel/cudnn8/Dockerfile
106-
ENV NV_CUDNN_VERSION 8.7.0.84-1
106+
ENV NV_CUDNN_VERSION 8.9.0.131-1
107107
ENV NV_CUDNN_PACKAGE libcudnn8-${NV_CUDNN_VERSION}.cuda11.8
108108
ENV NV_CUDNN_PACKAGE_DEV libcudnn8-devel-${NV_CUDNN_VERSION}.cuda11.8
109109

@@ -115,9 +115,11 @@ RUN yum install -y \
115115
&& yum clean all \
116116
&& rm -rf /var/cache/yum/*
117117

118-
# Install CUDA toolkit 11-8
118+
# Install CUDA toolkit 11.8
119119
RUN yum -y install cuda-toolkit-11-8 && \
120-
yum -y clean all --enablerepo='*'
120+
yum -y clean all --enablerepo="*"
121+
122+
# Set this flag so that libraries can find the location of CUDA
121123
ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
122124

123125
# Restore notebook user workspace

cuda/ubi9-python-3.9/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ USER 0
1717
WORKDIR /opt/app-root/bin
1818

1919
ENV NVARCH x86_64
20-
ENV NVIDIA_REQUIRE_CUDA "cuda>=11.8 brand=tesla,driver>=450,driver<451 brand=tesla,driver>=470,driver<471 brand=unknown,driver>=470,driver<471 brand=nvidia,driver>=470,driver<471 brand=nvidiartx,driver>=470,driver<471 brand=geforce,driver>=470,driver<471 brand=geforcertx,driver>=470,driver<471 brand=quadro,driver>=470,driver<471 brand=quadrortx,driver>=470,driver<471 brand=titan,driver>=470,driver<471 brand=titanrtx,driver>=470,driver<471 brand=tesla,driver>=510,driver<511 brand=unknown,driver>=510,driver<511 brand=nvidia,driver>=510,driver<511 brand=nvidiartx,driver>=510,driver<511 brand=geforce,driver>=510,driver<511 brand=geforcertx,driver>=510,driver<511 brand=quadro,driver>=510,driver<511 brand=quadrortx,driver>=510,driver<511 brand=titan,driver>=510,driver<511 brand=titanrtx,driver>=510,driver<511 brand=tesla,driver>=515,driver<516 brand=unknown,driver>=515,driver<516 brand=nvidia,driver>=515,driver<516 brand=nvidiartx,driver>=515,driver<516 brand=geforce,driver>=515,driver<516 brand=geforcertx,driver>=515,driver<516 brand=quadro,driver>=515,driver<516 brand=quadrortx,driver>=515,driver<516 brand=titan,driver>=515,driver<516 brand=titanrtx,driver>=515,driver<516"
20+
ENV NVIDIA_REQUIRE_CUDA "cuda>=11.8 brand=tesla,driver>=450,driver<451 brand=tesla,driver>=470,driver<471 brand=unknown,driver>=470,driver<471 brand=nvidia,driver>=470,driver<471 brand=nvidiartx,driver>=470,driver<471 brand=geforce,driver>=470,driver<471 brand=geforcertx,driver>=470,driver<471 brand=quadro,driver>=470,driver<471 brand=quadrortx,driver>=470,driver<471 brand=titan,driver>=470,driver<471 brand=titanrtx,driver>=470,driver<471"
2121
ENV NV_CUDA_CUDART_VERSION 11.8.89-1
2222

2323
COPY cuda.repo-x86_64 /etc/yum.repos.d/cuda.repo
@@ -70,6 +70,9 @@ RUN yum install -y \
7070
&& yum clean all \
7171
&& rm -rf /var/cache/yum/*
7272

73+
# Set this flag so that libraries can find the location of CUDA
74+
ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
75+
7376
# Install CUDA devel from:
7477
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.8.0/ubi8/devel/Dockerfile
7578
ENV NV_CUDA_LIB_VERSION 11.8.0-1
@@ -103,7 +106,7 @@ ENV LIBRARY_PATH /usr/local/cuda/lib64/stubs
103106

104107
# Install CUDA devel cudnn8 from:
105108
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.8.0/ubi8/devel/cudnn8/Dockerfile
106-
ENV NV_CUDNN_VERSION 8.7.0.84-1
109+
ENV NV_CUDNN_VERSION 8.9.0.131-1
107110
ENV NV_CUDNN_PACKAGE libcudnn8-${NV_CUDNN_VERSION}.cuda11.8
108111
ENV NV_CUDNN_PACKAGE_DEV libcudnn8-devel-${NV_CUDNN_VERSION}.cuda11.8
109112

0 commit comments

Comments
 (0)