Skip to content

Commit c5319e1

Browse files
harshad16harshad16
authored
Merge pull request #1239 from mtchoum1/docker-uv
[RHOAIENG-17006] Converted all dockerfiles and requirements.txt file to work with uv
2 parents bda8848 + feb5d28 commit c5319e1

File tree

30 files changed

+6245
-4300
lines changed

30 files changed

+6245
-4300
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN dnf install -y mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum
2828
USER 1001
2929

3030
# Install micropipenv to deploy packages from Pipfile.lock
31-
RUN pip install --no-cache-dir -U "micropipenv[toml]"
31+
RUN pip install --no-cache-dir -U uv
3232

3333
# Install the oc client
3434
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
@@ -101,13 +101,13 @@ ENV PATH="$PATH:/opt/mssql-tools18/bin"
101101
USER 1001
102102

103103
# Install Python packages and Jupyterlab extensions from Pipfile.lock
104-
COPY ${DATASCIENCE_SOURCE_CODE}/Pipfile.lock ./
104+
COPY ${DATASCIENCE_SOURCE_CODE}/requirements.txt ./
105105
# Copy Elyra setup to utils so that it's sourced at startup
106106
COPY ${DATASCIENCE_SOURCE_CODE}/setup-elyra.sh ${DATASCIENCE_SOURCE_CODE}/utils ./utils/
107107

108108
RUN echo "Installing softwares and packages" && \
109-
micropipenv install && \
110-
rm -f ./Pipfile.lock && \
109+
uv pip install --no-deps -r requirements.txt && \
110+
rm -f ./requirements.txt && \
111111
# setup path for runtime configuration
112112
mkdir /opt/app-root/runtimes && \
113113
mkdir /opt/app-root/pipeline-runtimes && \

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

Lines changed: 367 additions & 282 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN dnf install -y mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum
2828
USER 1001
2929

3030
# Install micropipenv to deploy packages from Pipfile.lock
31-
RUN pip install --no-cache-dir -U "micropipenv[toml]"
31+
RUN pip install --no-cache-dir -U uv
3232

3333
# Install the oc client
3434
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
@@ -101,13 +101,13 @@ ENV PATH="$PATH:/opt/mssql-tools18/bin"
101101
USER 1001
102102

103103
# Install Python packages and Jupyterlab extensions from Pipfile.lock
104-
COPY ${DATASCIENCE_SOURCE_CODE}/Pipfile.lock ./
104+
COPY ${DATASCIENCE_SOURCE_CODE}/requirements.txt ./
105105
# Copy Elyra setup to utils so that it's sourced at startup
106106
COPY ${DATASCIENCE_SOURCE_CODE}/setup-elyra.sh ${DATASCIENCE_SOURCE_CODE}/utils ./utils/
107107

108108
RUN echo "Installing softwares and packages" && \
109-
micropipenv install && \
110-
rm -f ./Pipfile.lock && \
109+
uv pip install --no-deps -r requirements.txt && \
110+
rm -f ./requirements.txt && \
111111
# setup path for runtime configuration
112112
mkdir /opt/app-root/runtimes && \
113113
mkdir /opt/app-root/pipeline-runtimes && \

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

Lines changed: 363 additions & 282 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN dnf install -y mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum
1515
USER 1001
1616

1717
# Install micropipenv to deploy packages from Pipfile.lock
18-
RUN pip install --no-cache-dir -U "micropipenv[toml]"
18+
RUN pip install --no-cache-dir -U uv
1919

2020
# Install the oc client
2121
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
@@ -53,12 +53,12 @@ ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
5353

5454
USER 1001
5555

56-
COPY ${MINIMAL_SOURCE_CODE}/Pipfile.lock ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
56+
COPY ${MINIMAL_SOURCE_CODE}/requirements.txt ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
5757

5858
# Install Python dependencies from Pipfile.lock file
5959
RUN echo "Installing softwares and packages" && \
60-
micropipenv install && \
61-
rm -f ./Pipfile.lock && \
60+
uv pip install --no-deps -r requirements.txt && \
61+
rm -f ./requirements.txt && \
6262
# Disable announcement plugin of jupyterlab \
6363
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
6464
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN dnf install -y mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum
1515
USER 1001
1616

1717
# Install micropipenv to deploy packages from Pipfile.lock
18-
RUN pip install --no-cache-dir -U "micropipenv[toml]"
18+
RUN pip install --no-cache-dir -U uv
1919

2020
# Install the oc client
2121
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
@@ -181,12 +181,12 @@ ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
181181

182182
USER 1001
183183

184-
COPY ${MINIMAL_SOURCE_CODE}/Pipfile.lock ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
184+
COPY ${MINIMAL_SOURCE_CODE}/requirements.txt ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
185185

186186
# Install Python dependencies from Pipfile.lock file
187187
RUN echo "Installing softwares and packages" && \
188-
micropipenv install && \
189-
rm -f ./Pipfile.lock && \
188+
uv pip install --no-deps -r requirements.txt && \
189+
rm -f ./requirements.txt && \
190190
# Disable announcement plugin of jupyterlab \
191191
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
192192
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \

‎jupyter/minimal/ubi9-python-3.11/Dockerfile.rocm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN dnf install -y mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum
1515
USER 1001
1616

1717
# Install micropipenv to deploy packages from Pipfile.lock
18-
RUN pip install --no-cache-dir -U "micropipenv[toml]"
18+
RUN pip install --no-cache-dir -U uv
1919

2020
# Install the oc client
2121
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
@@ -87,12 +87,12 @@ ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
8787

8888
USER 1001
8989

90-
COPY ${MINIMAL_SOURCE_CODE}/Pipfile.lock ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
90+
COPY ${MINIMAL_SOURCE_CODE}/requirements.txt ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
9191

9292
# Install Python dependencies from Pipfile.lock file
9393
RUN echo "Installing softwares and packages" && \
94-
micropipenv install && \
95-
rm -f ./Pipfile.lock && \
94+
uv pip install --no-deps -r requirements.txt && \
95+
rm -f ./requirements.txt && \
9696
# Disable announcement plugin of jupyterlab \
9797
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
9898
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \

0 commit comments

Comments
 (0)