Skip to content

Commit 64b0db0

Browse files
jstouracjstourac
committed
Merge remote-tracking branch 'upstream/main'
2 parents 5189c85 + 4011c07 commit 64b0db0

Some content is hidden

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

48 files changed

+2707
-3999
lines changed

‎jupyter/datascience/ubi9-python-3.11/Dockerfile.cpu

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
######################################################
2+
# mongocli-builder (build stage only, not published) #
3+
######################################################
4+
FROM registry.access.redhat.com/ubi9/go-toolset:latest AS mongocli-builder
5+
6+
ARG MONGOCLI_VERSION=2.0.3
7+
8+
WORKDIR /tmp/
9+
RUN curl -Lo mongodb-cli-mongocli-v${MONGOCLI_VERSION}.zip https://github.com/mongodb/mongodb-cli/archive/refs/tags/mongocli/v${MONGOCLI_VERSION}.zip
10+
RUN unzip ./mongodb-cli-mongocli-v${MONGOCLI_VERSION}.zip
11+
RUN cd ./mongodb-cli-mongocli-v${MONGOCLI_VERSION}/ && \
12+
CGO_ENABLED=1 GOOS=linux go build -a -tags strictfipsruntime -o /tmp/mongocli ./cmd/mongocli/
13+
114
########################
215
# base #
316
########################
@@ -66,10 +79,8 @@ USER root
6679
# Install useful OS packages
6780
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile && dnf clean all && rm -rf /var/cache/yum
6881

69-
# Install MongoDB Client, We need a special repo for MongoDB as they do their own distribution
70-
COPY ${DATASCIENCE_SOURCE_CODE}/mongodb-org-6.0.repo-x86_64 /etc/yum.repos.d/mongodb-org-6.0.repo
71-
72-
RUN dnf install -y mongocli && dnf clean all && rm -rf /var/cache/yum
82+
# Copy dynamically-linked mongocli built in earlier build stage
83+
COPY --from=mongocli-builder /tmp/mongocli /opt/app-root/bin/
7384

7485
# Install MSSQL Client, We need a special repo for MSSQL as they do their own distribution
7586
COPY ${DATASCIENCE_SOURCE_CODE}/mssql-2022.repo-x86_64 /etc/yum.repos.d/mssql-2022.repo
@@ -95,11 +106,11 @@ RUN echo "Installing softwares and packages" && \
95106
# Remove default Elyra runtime-images \
96107
rm /opt/app-root/share/jupyter/metadata/runtime-images/*.json && \
97108
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
98-
sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
109+
sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
99110
# Disable announcement plugin of jupyterlab \
100-
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
111+
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
101112
# Apply JupyterLab addons \
102-
/opt/app-root/bin/utils/addons/apply.sh && \
113+
/opt/app-root/bin/utils/addons/apply.sh && \
103114
# Fix permissions to support pip in Openshift environments \
104115
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
105116
fix-permissions /opt/app-root -P

‎jupyter/datascience/ubi9-python-3.11/Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ scikit-learn = "~=1.6.1"
1818
scipy = "~=1.15.2"
1919
skl2onnx = "~=1.18.0"
2020
onnxconverter-common = "~=1.13.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
21-
codeflare-sdk = "~=0.27.0"
21+
codeflare-sdk = "~=0.28.1"
2222
kubeflow-training = "==1.9.2"
2323

2424
# DB connectors

‎jupyter/datascience/ubi9-python-3.11/Pipfile.lock

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

‎jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎jupyter/datascience/ubi9-python-3.11/requirements.txt

Lines changed: 120 additions & 166 deletions
Large diffs are not rendered by default.

‎jupyter/pytorch/ubi9-python-3.11/Dockerfile.cuda

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
######################################################
2+
# mongocli-builder (build stage only, not published) #
3+
######################################################
4+
FROM registry.access.redhat.com/ubi9/go-toolset:latest AS mongocli-builder
5+
6+
ARG MONGOCLI_VERSION=2.0.3
7+
8+
WORKDIR /tmp/
9+
RUN curl -Lo mongodb-cli-mongocli-v${MONGOCLI_VERSION}.zip https://github.com/mongodb/mongodb-cli/archive/refs/tags/mongocli/v${MONGOCLI_VERSION}.zip
10+
RUN unzip ./mongodb-cli-mongocli-v${MONGOCLI_VERSION}.zip
11+
RUN cd ./mongodb-cli-mongocli-v${MONGOCLI_VERSION}/ && \
12+
CGO_ENABLED=1 GOOS=linux go build -a -tags strictfipsruntime -o /tmp/mongocli ./cmd/mongocli/
13+
114
####################
215
# base #
316
####################
@@ -135,7 +148,7 @@ RUN yum install -y \
135148
${NV_CUDNN_PACKAGE_DEV} \
136149
&& yum clean all \
137150
&& rm -rf /var/cache/yum/*
138-
151+
139152
# Set this flag so that libraries can find the location of CUDA
140153
ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
141154

@@ -146,7 +159,7 @@ WORKDIR /opt/app-root/src
146159
#########################
147160
# cuda-jupyter-minimal #
148161
#########################
149-
FROM cuda-base AS cuda-jupyter-minimal
162+
FROM cuda-base AS cuda-jupyter-minimal
150163

151164
ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
152165
ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.11
@@ -156,7 +169,7 @@ WORKDIR /opt/app-root/bin
156169
COPY ${JUPYTER_REUSABLE_UTILS} utils/
157170

158171
COPY ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
159-
172+
160173
WORKDIR /opt/app-root/src
161174

162175
ENTRYPOINT ["start-notebook.sh"]
@@ -176,10 +189,8 @@ USER root
176189
# Install useful OS packages
177190
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile && dnf clean all && rm -rf /var/cache/yum
178191

179-
# Install MongoDB Client, We need a special repo for MongoDB as they do their own distribution
180-
COPY ${DATASCIENCE_SOURCE_CODE}/mongodb-org-6.0.repo-x86_64 /etc/yum.repos.d/mongodb-org-6.0.repo
181-
182-
RUN dnf install -y mongocli && dnf clean all && rm -rf /var/cache/yum
192+
# Copy dynamically-linked mongocli built in earlier build stage
193+
COPY --from=mongocli-builder /tmp/mongocli /opt/app-root/bin/
183194

184195
# Install MSSQL Client, We need a special repo for MSSQL as they do their own distribution
185196
COPY ${DATASCIENCE_SOURCE_CODE}/mssql-2022.repo-x86_64 /etc/yum.repos.d/mssql-2022.repo
@@ -227,14 +238,13 @@ RUN echo "Installing softwares and packages" && \
227238
# Remove default Elyra runtime-images \
228239
rm /opt/app-root/share/jupyter/metadata/runtime-images/*.json && \
229240
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
230-
sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
241+
sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
231242
# Disable announcement plugin of jupyterlab \
232-
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
243+
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
233244
# Apply JupyterLab addons \
234-
/opt/app-root/bin/utils/addons/apply.sh && \
245+
/opt/app-root/bin/utils/addons/apply.sh && \
235246
# Fix permissions to support pip in Openshift environments \
236247
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
237248
fix-permissions /opt/app-root -P
238249

239250
WORKDIR /opt/app-root/src
240-

‎jupyter/pytorch/ubi9-python-3.11/Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ scikit-learn = "~=1.6.1"
2828
scipy = "~=1.15.2"
2929
skl2onnx = "~=1.18.0"
3030
onnxconverter-common = "~=1.13.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
31-
codeflare-sdk = "~=0.27.0"
31+
codeflare-sdk = "~=0.28.1"
3232
kubeflow-training = "==1.9.2"
3333

3434
# DB connectors

0 commit comments

Comments
 (0)