Skip to content

Commit 6ee8518

Browse files
authored
Merge pull request #2555 from jesuino/RHOAIENG-18582
RHOAIENG-18582, RHAIENG-1960: delete our copy of `bootstrapper.py` post ODH-Elyra release v4.3.0
2 parents 72a592a + b45378e commit 6ee8518

File tree

14 files changed

+44
-5390
lines changed

14 files changed

+44
-5390
lines changed

runtimes/datascience/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,12 @@ EOF
387387
# Install Python packages from pylock.toml
388388
COPY ${DATASCIENCE_SOURCE_CODE}/pylock.toml ./
389389
# Copy Elyra dependencies for air-gapped enviroment
390-
COPY ${DATASCIENCE_SOURCE_CODE}/utils ./utils/
390+
COPY --chown=1001 ${DATASCIENCE_SOURCE_CODE}/utils ./utils/
391+
# Download Elyra Bootstrapper
392+
RUN curl -fL https://raw.githubusercontent.com/opendatahub-io/elyra/refs/tags/v4.3.1/elyra/kfp/bootstrapper.py \
393+
-o ./utils/bootstrapper.py
394+
# Prevent Elyra from re-installing the dependencies
395+
ENV ELYRA_INSTALL_PACKAGES="false"
391396

392397
RUN --mount=type=cache,target=/root/.cache/pip /bin/bash <<'EOF'
393398
set -Eeuxo pipefail

runtimes/datascience/ubi9-python-3.12/utils/bootstrapper.py

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

runtimes/minimal/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,14 @@ WORKDIR /opt/app-root/bin
8686

8787
# Install Python packages from requirements.txt
8888
COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ./
89+
8990
# Copy Elyra dependencies for air-gapped enviroment
90-
COPY ${MINIMAL_SOURCE_CODE}/utils ./utils/
91+
COPY --chown=1001 ${MINIMAL_SOURCE_CODE}/utils ./utils/
92+
# Download Elyra Bootstrapper
93+
RUN curl -fL https://raw.githubusercontent.com/opendatahub-io/elyra/refs/tags/v4.3.1/elyra/kfp/bootstrapper.py \
94+
-o ./utils/bootstrapper.py
95+
# Prevent Elyra from re-installing the dependencies
96+
ENV ELYRA_INSTALL_PACKAGES="false"
9197

9298
RUN /bin/bash <<'EOF'
9399
set -Eeuxo pipefail

0 commit comments

Comments
 (0)