Skip to content

Commit 8bbdfd7

Browse files
jiridanekjiridanek
committed
RHAIENG-1965: chore(cli): manual alignments (#1711)
1 parent 7933486 commit 8bbdfd7

File tree

14 files changed

+62
-31
lines changed

14 files changed

+62
-31
lines changed

‎codeserver/ubi9-python-3.12/Dockerfile.konflux.cpu‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ RUN touch /tmp/control
7272
# cpu-base #
7373
####################
7474
FROM ${BASE_IMAGE} AS cpu-base
75-
USER 0
76-
RUN subscription-manager refresh
7775

7876
WORKDIR /opt/app-root/bin
7977

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ EOF
4040
# cpu-base #
4141
####################
4242
FROM ${BASE_IMAGE} AS cpu-base
43-
USER 0
44-
RUN subscription-manager refresh
4543

4644
WORKDIR /opt/app-root/bin
4745

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ RUN --mount=type=cache,from=pdf-builder,source=/usr/local/,target=/pdf_builder/,
119119
./utils/install_pdf_deps.sh; \
120120
fi'
121121

122+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
123+
122124
USER 1001
123125

124126
COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.cpu‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ RUN ./install_pandoc.sh
2828
# cpu-base #
2929
####################
3030
FROM ${BASE_IMAGE} AS cpu-base
31-
USER 0
32-
RUN subscription-manager refresh
3331

3432
WORKDIR /opt/app-root/bin
3533

@@ -111,6 +109,8 @@ RUN --mount=type=cache,from=pdf-builder,source=/usr/local/,target=/pdf_builder/,
111109
./utils/install_pdf_deps.sh; \
112110
fi'
113111

112+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
113+
114114
USER 1001
115115

116116
COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
@@ -146,9 +146,3 @@ LABEL name="rhoai/odh-workbench-jupyter-minimal-cpu-py312-rhel9" \
146146
description="Minimal Jupyter CPU notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
147147
io.k8s.description="Minimal Jupyter CPU notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
148148
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
149-
150-
### BEGIN Dependencies for PDF export
151-
RUN ./utils/install_pdf_deps.sh
152-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
153-
154-
### END Dependencies for PDF export

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.cuda‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
1212
# cuda-base #
1313
####################
1414
FROM ${BASE_IMAGE} AS cuda-base
15-
USER 0
16-
RUN subscription-manager refresh
1715

1816
WORKDIR /opt/app-root/bin
1917

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.rocm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
1010
# rocm-base #
1111
####################
1212
FROM ${BASE_IMAGE} AS rocm-base
13-
USER 0
14-
RUN subscription-manager refresh
1513

1614
WORKDIR /opt/app-root/bin
1715

‎jupyter/trustyai/ubi9-python-3.12/Dockerfile.konflux.cpu‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ EOF
2626
# wheel-cache-base #
2727
####################
2828
FROM ${BASE_IMAGE} AS whl-cache
29-
USER 0
30-
RUN subscription-manager refresh
3129

3230
# hadolint ignore=DL3002
3331
USER root
@@ -53,8 +51,6 @@ EOF
5351
# cpu-base #
5452
####################
5553
FROM ${BASE_IMAGE} AS cpu-base
56-
USER 0
57-
RUN subscription-manager refresh
5854

5955
WORKDIR /opt/app-root/bin
6056

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
1010
# cpu-base #
1111
####################
1212
FROM ${BASE_IMAGE} AS cpu-base
13-
USER 0
14-
RUN subscription-manager refresh
1513

1614
ARG TARGETARCH
1715

@@ -387,7 +385,14 @@ EOF
387385
# Install Python packages from pylock.toml
388386
COPY ${DATASCIENCE_SOURCE_CODE}/pylock.toml ./
389387
# Copy Elyra dependencies for air-gapped enviroment
390-
COPY ${DATASCIENCE_SOURCE_CODE}/utils ./utils/
388+
COPY --chown=1001 ${DATASCIENCE_SOURCE_CODE}/utils ./utils/
389+
### BEGIN Download Elyra Bootstrapper
390+
RUN curl -fL https://raw.githubusercontent.com/opendatahub-io/elyra/refs/tags/v4.3.1/elyra/kfp/bootstrapper.py \
391+
-o ./utils/bootstrapper.py
392+
# Prevent Elyra from re-installing the dependencies
393+
ENV ELYRA_INSTALL_PACKAGES="false"
394+
395+
### END Download Elyra Bootstrapper
391396

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

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
1010
# cpu-base #
1111
####################
1212
FROM ${BASE_IMAGE} AS cpu-base
13-
USER 0
14-
RUN subscription-manager refresh
1513

1614
WORKDIR /opt/app-root/bin
1715

@@ -86,8 +84,16 @@ WORKDIR /opt/app-root/bin
8684

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

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

‎runtimes/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.konflux.cuda‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,14 @@ WORKDIR /opt/app-root/bin
8181
# Install Python packages from requirements.txt
8282
COPY ${PYTORCH_SOURCE_CODE}/pylock.toml ./
8383
# Copy Elyra dependencies for air-gapped enviroment
84-
COPY ${PYTORCH_SOURCE_CODE}/utils ./utils/
84+
COPY --chown=1001 ${PYTORCH_SOURCE_CODE}/utils ./utils/
85+
### BEGIN Download Elyra Bootstrapper
86+
RUN curl -fL https://raw.githubusercontent.com/opendatahub-io/elyra/refs/tags/v4.3.1/elyra/kfp/bootstrapper.py \
87+
-o ./utils/bootstrapper.py
88+
# Prevent Elyra from re-installing the dependencies
89+
ENV ELYRA_INSTALL_PACKAGES="false"
90+
91+
### END Download Elyra Bootstrapper
8592

8693
RUN /bin/bash <<'EOF'
8794
set -Eeuxo pipefail

0 commit comments

Comments
 (0)