Skip to content

Commit 661554c

Browse files
jiridanekjiridanek
committed
AIPCC-7097, AIPCC-7098: undo cpu base image update, because somehow IBM arches are not covered
https://redhat-internal.slack.com/archives/C08GRQ4TRTJ/p1763017110987709?thread_ts=1762999724.802359&cid=C08GRQ4TRTJ * the exception is RStudio RHEL9 where we don't have IBM Power/Z images so there we can update
1 parent 8772c63 commit 661554c

File tree

18 files changed

+113
-6
lines changed

18 files changed

+113
-6
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
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+
69
####################
710
# rpm-base #
811
####################
@@ -15,6 +18,11 @@ WORKDIR /root
1518

1619
ENV HOME=/root
1720

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+
1826
ARG CODESERVER_SOURCE_CODE=codeserver/ubi9-python-3.12
1927

2028
ARG NODE_VERSION=22.18.0
@@ -70,6 +78,11 @@ WORKDIR /opt/app-root/bin
7078
# OS Packages needs to be installed as root
7179
USER 0
7280

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+
7386
### BEGIN upgrade first to avoid fixable vulnerabilities
7487
# If we have a Red Hat subscription prepared, refresh it
7588
RUN /bin/bash <<'EOF'

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
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+
69
####################
710
# rpm-base #
811
####################
@@ -15,6 +18,11 @@ WORKDIR /root
1518

1619
ENV HOME=/root
1720

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+
1826
ARG CODESERVER_SOURCE_CODE=codeserver/ubi9-python-3.12
1927

2028
ARG NODE_VERSION=22.18.0
@@ -70,6 +78,11 @@ WORKDIR /opt/app-root/bin
7078
# OS Packages needs to be installed as root
7179
USER 0
7280

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+
7386
### BEGIN upgrade first to avoid fixable vulnerabilities
7487
# If we have a Red Hat subscription prepared, refresh it
7588
RUN /bin/bash <<'EOF'

‎codeserver/ubi9-python-3.12/build-args/cpu.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Base Image : RHEL 9.6 with Python 3.12
22
# Architectures: linux/arm64, linux/ppc64le, linux/x86_64, linux/s360x
3-
BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.1-1763000001
3+
BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.0-1761580156

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
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+
69
######################################################
710
# mongocli-builder (build stage only, not published) #
811
######################################################
@@ -44,6 +47,11 @@ WORKDIR /opt/app-root/bin
4447
USER root
4548
ARG TARGETARCH
4649

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+
4755
### BEGIN upgrade first to avoid fixable vulnerabilities
4856
# If we have a Red Hat subscription prepared, refresh it
4957
RUN /bin/bash <<'EOF'

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
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+
69
######################################################
710
# mongocli-builder (build stage only, not published) #
811
######################################################
@@ -44,6 +47,11 @@ WORKDIR /opt/app-root/bin
4447
USER root
4548
ARG TARGETARCH
4649

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+
4755
### BEGIN upgrade first to avoid fixable vulnerabilities
4856
# If we have a Red Hat subscription prepared, refresh it
4957
RUN /bin/bash <<'EOF'

‎jupyter/datascience/ubi9-python-3.12/build-args/cpu.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Base Image : RHEL 9.6 with Python 3.12
22
# Architectures: linux/arm64, linux/ppc64le, linux/x86_64, linux/s360x
3-
BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.1-1763000001
3+
BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.0-1761580156

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
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+
69
############################
710
# Stage 1: PDF Tool Build #
811
############################
@@ -32,6 +35,11 @@ WORKDIR /opt/app-root/bin
3235
# OS Packages needs to be installed as root
3336
USER 0
3437

38+
# Inject the official UBI 9 repository configuration into the AIPCC base image.
39+
# 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.
40+
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
41+
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
42+
3543
### BEGIN upgrade first to avoid fixable vulnerabilities
3644
# If we have a Red Hat subscription prepared, refresh it
3745
RUN /bin/bash <<'EOF'

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
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+
69
############################
710
# Stage 1: PDF Tool Build #
811
############################
@@ -32,6 +35,11 @@ WORKDIR /opt/app-root/bin
3235
# OS Packages needs to be installed as root
3336
USER 0
3437

38+
# Inject the official UBI 9 repository configuration into the AIPCC base image.
39+
# 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.
40+
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
41+
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
42+
3543
### BEGIN upgrade first to avoid fixable vulnerabilities
3644
# If we have a Red Hat subscription prepared, refresh it
3745
RUN /bin/bash <<'EOF'

‎jupyter/minimal/ubi9-python-3.12/build-args/cpu.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Base Image : RHEL 9.6 with Python 3.12
22
# Architectures: linux/arm64, linux/ppc64le, linux/x86_64, linux/s360x
3-
BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.1-1763000001
3+
BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.0-1761580156

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
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+
69
######################################################
710
# mongocli-builder (build stage only, not published) #
811
######################################################
@@ -54,6 +57,11 @@ WORKDIR /opt/app-root/bin
5457
# OS Packages needs to be installed as root
5558
USER root
5659

60+
# Inject the official UBI 9 repository configuration into the AIPCC base image.
61+
# 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.
62+
# By copying ubi.repo from the public UBI 9 image, we enable package management for upgrades and installations.
63+
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
64+
5765
### BEGIN upgrade first to avoid fixable vulnerabilities
5866
# If we have a Red Hat subscription prepared, refresh it
5967
RUN /bin/bash <<'EOF'

0 commit comments

Comments
 (0)