Skip to content

Commit c8be9d8

Browse files
jiridanekjiridanek
committed
Merge remote-tracking branch 'upstream/main' into rhoai-3.2
2 parents 5e033a6 + a8a75f4 commit c8be9d8

File tree

44 files changed

+429
-47
lines changed

Some content is hidden

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

44 files changed

+429
-47
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ USER 0
8484
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
8585

8686
### BEGIN upgrade first to avoid fixable vulnerabilities
87+
# If we have a Red Hat subscription prepared, refresh it
88+
RUN /bin/bash <<'EOF'
89+
set -Eeuxo pipefail
90+
if command -v subscription-manager &> /dev/null; then
91+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
92+
fi
93+
EOF
94+
8795
# Problem: The operation would result in removing the following protected packages: systemd
8896
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
8997
# Solution: --best --skip-broken does not work either, so use --nobest

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

Lines changed: 8 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

@@ -86,6 +84,14 @@ USER 0
8684
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
8785

8886
### BEGIN upgrade first to avoid fixable vulnerabilities
87+
# If we have a Red Hat subscription prepared, refresh it
88+
RUN /bin/bash <<'EOF'
89+
set -Eeuxo pipefail
90+
if command -v subscription-manager &> /dev/null; then
91+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
92+
fi
93+
EOF
94+
8995
# Problem: The operation would result in removing the following protected packages: systemd
9096
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
9197
# Solution: --best --skip-broken does not work either, so use --nobest

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ EOF
4040
# cpu-base #
4141
####################
4242
FROM ${BASE_IMAGE} AS cpu-base
43-
USER 0
44-
RUN /bin/bash <<'EOF'
45-
set -Eeuxo pipefail
46-
if command -v subscription-manager &> /dev/null; then
47-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
48-
fi
49-
EOF
5043

5144
WORKDIR /opt/app-root/bin
5245

@@ -60,6 +53,14 @@ ARG TARGETARCH
6053
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
6154

6255
### BEGIN upgrade first to avoid fixable vulnerabilities
56+
# If we have a Red Hat subscription prepared, refresh it
57+
RUN /bin/bash <<'EOF'
58+
set -Eeuxo pipefail
59+
if command -v subscription-manager &> /dev/null; then
60+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
61+
fi
62+
EOF
63+
6364
# Problem: The operation would result in removing the following protected packages: systemd
6465
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
6566
# Solution: --best --skip-broken does not work either, so use --nobest

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

Lines changed: 8 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

@@ -55,6 +53,14 @@ ARG TARGETARCH
5553
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
5654

5755
### BEGIN upgrade first to avoid fixable vulnerabilities
56+
# If we have a Red Hat subscription prepared, refresh it
57+
RUN /bin/bash <<'EOF'
58+
set -Eeuxo pipefail
59+
if command -v subscription-manager &> /dev/null; then
60+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
61+
fi
62+
EOF
63+
5864
# Problem: The operation would result in removing the following protected packages: systemd
5965
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
6066
# Solution: --best --skip-broken does not work either, so use --nobest

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ FROM registry.access.redhat.com/ubi9/python-312:latest AS pdf-builder
1414
WORKDIR /opt/app-root/bin
1515

1616
# OS Packages needs to be installed as root
17+
# hadolint ignore=DL3002
1718
USER 0
1819

1920
# Copy scripts
@@ -40,6 +41,14 @@ USER 0
4041
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
4142

4243
### BEGIN upgrade first to avoid fixable vulnerabilities
44+
# If we have a Red Hat subscription prepared, refresh it
45+
RUN /bin/bash <<'EOF'
46+
set -Eeuxo pipefail
47+
if command -v subscription-manager &> /dev/null; then
48+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
49+
fi
50+
EOF
51+
4352
# Problem: The operation would result in removing the following protected packages: systemd
4453
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
4554
# Solution: --best --skip-broken does not work either, so use --nobest
@@ -111,6 +120,8 @@ RUN --mount=type=cache,from=pdf-builder,source=/usr/local/,target=/pdf_builder/,
111120
./utils/install_pdf_deps.sh; \
112121
fi'
113122

123+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
124+
114125
USER 1001
115126

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

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ USER 0
2424
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
2525

2626
### BEGIN upgrade first to avoid fixable vulnerabilities
27+
# If we have a Red Hat subscription prepared, refresh it
28+
RUN /bin/bash <<'EOF'
29+
set -Eeuxo pipefail
30+
if command -v subscription-manager &> /dev/null; then
31+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
32+
fi
33+
EOF
34+
2735
# Problem: The operation would result in removing the following protected packages: systemd
2836
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
2937
# Solution: --best --skip-broken does not work either, so use --nobest

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ FROM registry.access.redhat.com/ubi9/python-312:latest AS pdf-builder
1414
WORKDIR /opt/app-root/bin
1515

1616
# OS Packages needs to be installed as root
17+
# hadolint ignore=DL3002
1718
USER 0
1819

1920
# Copy scripts
@@ -28,8 +29,6 @@ RUN ./install_pandoc.sh
2829
# cpu-base #
2930
####################
3031
FROM ${BASE_IMAGE} AS cpu-base
31-
USER 0
32-
RUN subscription-manager refresh
3332

3433
WORKDIR /opt/app-root/bin
3534

@@ -42,6 +41,14 @@ USER 0
4241
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
4342

4443
### BEGIN upgrade first to avoid fixable vulnerabilities
44+
# If we have a Red Hat subscription prepared, refresh it
45+
RUN /bin/bash <<'EOF'
46+
set -Eeuxo pipefail
47+
if command -v subscription-manager &> /dev/null; then
48+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
49+
fi
50+
EOF
51+
4552
# Problem: The operation would result in removing the following protected packages: systemd
4653
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
4754
# Solution: --best --skip-broken does not work either, so use --nobest
@@ -103,6 +110,8 @@ RUN --mount=type=cache,from=pdf-builder,source=/usr/local/,target=/pdf_builder/,
103110
./utils/install_pdf_deps.sh; \
104111
fi'
105112

113+
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
114+
106115
USER 1001
107116

108117
COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
@@ -138,9 +147,3 @@ LABEL name="rhoai/odh-workbench-jupyter-minimal-cpu-py312-rhel9" \
138147
description="Minimal Jupyter CPU notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
139148
io.k8s.description="Minimal Jupyter CPU notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
140149
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"
141-
142-
### BEGIN Dependencies for PDF export
143-
RUN ./utils/install_pdf_deps.sh
144-
ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"
145-
146-
### END Dependencies for PDF export

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

Lines changed: 8 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

@@ -26,6 +24,14 @@ USER 0
2624
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
2725

2826
### BEGIN upgrade first to avoid fixable vulnerabilities
27+
# If we have a Red Hat subscription prepared, refresh it
28+
RUN /bin/bash <<'EOF'
29+
set -Eeuxo pipefail
30+
if command -v subscription-manager &> /dev/null; then
31+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
32+
fi
33+
EOF
34+
2935
# Problem: The operation would result in removing the following protected packages: systemd
3036
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
3137
# Solution: --best --skip-broken does not work either, so use --nobest

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

Lines changed: 8 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

@@ -24,6 +22,14 @@ USER 0
2422
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
2523

2624
### BEGIN upgrade first to avoid fixable vulnerabilities
25+
# If we have a Red Hat subscription prepared, refresh it
26+
RUN /bin/bash <<'EOF'
27+
set -Eeuxo pipefail
28+
if command -v subscription-manager &> /dev/null; then
29+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
30+
fi
31+
EOF
32+
2733
# Problem: The operation would result in removing the following protected packages: systemd
2834
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
2935
# Solution: --best --skip-broken does not work either, so use --nobest

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ USER 0
2222
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
2323

2424
### BEGIN upgrade first to avoid fixable vulnerabilities
25+
# If we have a Red Hat subscription prepared, refresh it
26+
RUN /bin/bash <<'EOF'
27+
set -Eeuxo pipefail
28+
if command -v subscription-manager &> /dev/null; then
29+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
30+
fi
31+
EOF
32+
2533
# Problem: The operation would result in removing the following protected packages: systemd
2634
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
2735
# Solution: --best --skip-broken does not work either, so use --nobest

0 commit comments

Comments
 (0)