Skip to content

Commit 3d73bd7

Browse files
committed
RHAIENG-948: remove UBI 9 repository injection across all Dockerfiles (#3020)
``` + dnf install -y perl mesa-libGL skopeo gcc gcc-c++ make openssl-devel autoconf automake libtool cmake python3-devel pybind11-devel openblas-devel unixODBC-devel Updating Subscription Management repositories. Red Hat Universal Base Image 9 (RPMs) - BaseOS 1.4 MB/s | 433 kB 00:00 Red Hat Universal Base Image 9 (RPMs) - AppStre 6.4 MB/s | 2.2 MB 00:00 Red Hat Universal Base Image 9 (RPMs) - CodeRea 683 kB/s | 174 kB 00:00 Package mesa-libGL-24.2.8-3.el9_6.s390x is already installed. Package skopeo-2:1.20.0-1.el9.s390x is already installed. Package gcc-11.5.0-11.el9.s390x is already installed. Error: Problem: package mesa-dri-drivers-25.0.7-3.el9_7.s390x from ubi-9-appstream-rpms requires libLLVM.so.20.1()(64bit), but none of the providers can be installed - package mesa-dri-drivers-25.0.7-3.el9_7.s390x from ubi-9-appstream-rpms requires libLLVM.so.20.1(LLVM_20.1)(64bit), but none of the providers can be installed - cannot install both llvm-libs-20.1.8-3.el9.s390x from ubi-9-appstream-rpms and llvm-libs-19.1.7-2.el9.s390x from @System - package mesa-libGL-25.0.7-3.el9_7.s390x from ubi-9-appstream-rpms requires libgallium-25.0.7.so()(64bit), but none of the providers can be installed ... ```
1 parent b5ec92a commit 3d73bd7

File tree

20 files changed

+0
-164
lines changed

20 files changed

+0
-164
lines changed

codeserver/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
#########################
44
ARG BASE_IMAGE
55

6-
# External image alias for UBI repository configuration
7-
FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
8-
96
####################
107
# rpm-base #
118
####################
@@ -18,11 +15,6 @@ WORKDIR /root
1815

1916
ENV HOME=/root
2017

21-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
22-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
23-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
24-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
25-
2618
ARG CODESERVER_SOURCE_CODE=codeserver/ubi9-python-3.12
2719

2820
ARG NODE_VERSION=22.18.0
@@ -78,11 +70,6 @@ WORKDIR /opt/app-root/bin
7870
# OS Packages needs to be installed as root
7971
USER 0
8072

81-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
82-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
83-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
84-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
85-
8673
### BEGIN upgrade first to avoid fixable vulnerabilities
8774
# If we have a Red Hat subscription prepared, refresh it
8875
RUN /bin/bash <<'EOF'

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
#########################
44
ARG BASE_IMAGE
55

6-
# External image alias for UBI repository configuration
7-
FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
8-
96
######################################################
107
# mongocli-builder (build stage only, not published) #
118
######################################################
@@ -47,11 +44,6 @@ WORKDIR /opt/app-root/bin
4744
USER root
4845
ARG TARGETARCH
4946

50-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
51-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
52-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
53-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
54-
5547
### BEGIN upgrade first to avoid fixable vulnerabilities
5648
# If we have a Red Hat subscription prepared, refresh it
5749
RUN /bin/bash <<'EOF'

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ WORKDIR /opt/app-root/bin
1616
# OS Packages needs to be installed as root
1717
USER 0
1818

19-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
20-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
21-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
22-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
23-
2419
### BEGIN upgrade first to avoid fixable vulnerabilities
2520
# If we have a Red Hat subscription prepared, refresh it
2621
RUN /bin/bash <<'EOF'

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ ARG TARGETARCH
55
#########################
66
ARG BASE_IMAGE
77

8-
# External image alias for UBI repository configuration
9-
FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
10-
118
####################
129
# cuda-base #
1310
####################
@@ -18,11 +15,6 @@ WORKDIR /opt/app-root/bin
1815
# OS Packages needs to be installed as root
1916
USER 0
2017

21-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
22-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
23-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
24-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
25-
2618
### BEGIN upgrade first to avoid fixable vulnerabilities
2719
# If we have a Red Hat subscription prepared, refresh it
2820
RUN /bin/bash <<'EOF'

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
#########################
44
ARG BASE_IMAGE
55

6-
# External image alias for UBI repository configuration
7-
FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
8-
96
####################
107
# rocm-base #
118
####################
@@ -16,11 +13,6 @@ WORKDIR /opt/app-root/bin
1613
# OS Packages needs to be installed as root
1714
USER 0
1815

19-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
20-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
21-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
22-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
23-
2416
### BEGIN upgrade first to avoid fixable vulnerabilities
2517
# If we have a Red Hat subscription prepared, refresh it
2618
RUN /bin/bash <<'EOF'

jupyter/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ ARG TARGETARCH
55
#########################
66
ARG BASE_IMAGE
77

8-
# External image alias for UBI repository configuration
9-
FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
10-
118
######################################################
129
# mongocli-builder (build stage only, not published) #
1310
######################################################
@@ -34,11 +31,6 @@ WORKDIR /opt/app-root/bin
3431
# OS Packages needs to be installed as root
3532
USER 0
3633

37-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
38-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
39-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
40-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
41-
4234
### BEGIN upgrade first to avoid fixable vulnerabilities
4335
# If we have a Red Hat subscription prepared, refresh it
4436
RUN /bin/bash <<'EOF'

jupyter/pytorch/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ ARG TARGETARCH
55
#########################
66
ARG BASE_IMAGE
77

8-
# External image alias for UBI repository configuration
9-
FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
10-
118
######################################################
129
# mongocli-builder (build stage only, not published) #
1310
######################################################
@@ -34,11 +31,6 @@ WORKDIR /opt/app-root/bin
3431
# OS Packages needs to be installed as root
3532
USER 0
3633

37-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
38-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
39-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
40-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
41-
4234
### BEGIN upgrade first to avoid fixable vulnerabilities
4335
# If we have a Red Hat subscription prepared, refresh it
4436
RUN /bin/bash <<'EOF'

jupyter/rocm/pytorch/ubi9-python-3.12/Dockerfile.rocm

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
#########################
44
ARG BASE_IMAGE
55

6-
# External image alias for UBI repository configuration
7-
FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
8-
96
######################################################
107
# mongocli-builder (build stage only, not published) #
118
######################################################
@@ -32,11 +29,6 @@ WORKDIR /opt/app-root/bin
3229
# OS Packages needs to be installed as root
3330
USER 0
3431

35-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
36-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
37-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
38-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
39-
4032
### BEGIN upgrade first to avoid fixable vulnerabilities
4133
# If we have a Red Hat subscription prepared, refresh it
4234
RUN /bin/bash <<'EOF'

jupyter/rocm/tensorflow/ubi9-python-3.12/Dockerfile.rocm

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
#########################
44
ARG BASE_IMAGE
55

6-
# External image alias for UBI repository configuration
7-
FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
8-
96
######################################################
107
# mongocli-builder (build stage only, not published) #
118
######################################################
@@ -32,11 +29,6 @@ WORKDIR /opt/app-root/bin
3229
# OS Packages needs to be installed as root
3330
USER 0
3431

35-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
36-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
37-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
38-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
39-
4032
### BEGIN upgrade first to avoid fixable vulnerabilities
4133
# If we have a Red Hat subscription prepared, refresh it
4234
RUN /bin/bash <<'EOF'

jupyter/tensorflow/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ ARG TARGETARCH
55
#########################
66
ARG BASE_IMAGE
77

8-
# External image alias for UBI repository configuration
9-
FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
10-
118
######################################################
129
# mongocli-builder (build stage only, not published) #
1310
######################################################
@@ -34,11 +31,6 @@ WORKDIR /opt/app-root/bin
3431
# OS Packages needs to be installed as root
3532
USER 0
3633

37-
# Inject the official UBI 9 repository configuration into the AIPCC base image.
38-
# The Quay-based AIPCC image is "repo-less" by default (https://gitlab.com/redhat/rhel-ai/core/base-images/app#repositories), so dnf cannot upgrade or install packages.
39-
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
40-
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
41-
4234
### BEGIN upgrade first to avoid fixable vulnerabilities
4335
# If we have a Red Hat subscription prepared, refresh it
4436
RUN /bin/bash <<'EOF'

0 commit comments

Comments
 (0)