Skip to content

Commit e5e85da

Browse files
jiridanekjiridanek
authored
Merge pull request #1734 from red-hat-data-services/main
https://github.com/red-hat-data-services/rhods-devops-infra/actions/runs/19697582908
2 parents 2b1d1ed + 9b1be94 commit e5e85da

File tree

44 files changed

+318
-133
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

+318
-133
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,12 @@ WORKDIR /opt/app-root/bin
7676
USER 0
7777

7878
### BEGIN upgrade first to avoid fixable vulnerabilities
79-
# If we have a Red Hat subscription prepared, refresh it
8079
RUN /bin/bash <<'EOF'
80+
# The devops activationkey is not powerful enough, use rhoai-ide-konflux key
81+
# https://redhat-internal.slack.com/archives/C07SBP17R7Z/p1764077596143619?thread_ts=1761667034.429529&cid=C07SBP17R7Z
82+
subscription-manager register --org 18631088 --activationkey thisisunsafe
83+
84+
# If we have a Red Hat subscription prepared, refresh it
8185
set -Eeuxo pipefail
8286
if command -v subscription-manager &> /dev/null; then
8387
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,12 @@ 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
8887
RUN /bin/bash <<'EOF'
88+
# The devops activationkey is not powerful enough, use rhoai-ide-konflux key
89+
# https://redhat-internal.slack.com/archives/C07SBP17R7Z/p1764077596143619?thread_ts=1761667034.429529&cid=C07SBP17R7Z
90+
subscription-manager register --org 18631088 --activationkey thisisunsafe
91+
92+
# If we have a Red Hat subscription prepared, refresh it
8993
set -Eeuxo pipefail
9094
if command -v subscription-manager &> /dev/null; then
9195
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
@@ -95,10 +99,9 @@ EOF
9599
# Problem: The operation would result in removing the following protected packages: systemd
96100
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
97101
# Solution: --best --skip-broken does not work either, so use --nobest
98-
RUN /bin/bash <<'EOF'
102+
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
99103
set -Eeuxo pipefail
100-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
101-
dnf clean all -y
104+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
102105
EOF
103106

104107
### END upgrade first to avoid fixable vulnerabilities

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,12 @@ USER root
4545
ARG TARGETARCH
4646

4747
### BEGIN upgrade first to avoid fixable vulnerabilities
48-
# If we have a Red Hat subscription prepared, refresh it
4948
RUN /bin/bash <<'EOF'
49+
# The devops activationkey is not powerful enough, use rhoai-ide-konflux key
50+
# https://redhat-internal.slack.com/archives/C07SBP17R7Z/p1764077596143619?thread_ts=1761667034.429529&cid=C07SBP17R7Z
51+
subscription-manager register --org 18631088 --activationkey thisisunsafe
52+
53+
# If we have a Red Hat subscription prepared, refresh it
5054
set -Eeuxo pipefail
5155
if command -v subscription-manager &> /dev/null; then
5256
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,12 @@ ARG TARGETARCH
5353
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
5454

5555
### BEGIN upgrade first to avoid fixable vulnerabilities
56-
# If we have a Red Hat subscription prepared, refresh it
5756
RUN /bin/bash <<'EOF'
57+
# The devops activationkey is not powerful enough, use rhoai-ide-konflux key
58+
# https://redhat-internal.slack.com/archives/C07SBP17R7Z/p1764077596143619?thread_ts=1761667034.429529&cid=C07SBP17R7Z
59+
subscription-manager register --org 18631088 --activationkey thisisunsafe
60+
61+
# If we have a Red Hat subscription prepared, refresh it
5862
set -Eeuxo pipefail
5963
if command -v subscription-manager &> /dev/null; then
6064
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
@@ -64,10 +68,9 @@ EOF
6468
# Problem: The operation would result in removing the following protected packages: systemd
6569
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
6670
# Solution: --best --skip-broken does not work either, so use --nobest
67-
RUN /bin/bash <<'EOF'
71+
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
6872
set -Eeuxo pipefail
69-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
70-
dnf clean all -y
73+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
7174
EOF
7275

7376
### END upgrade first to avoid fixable vulnerabilities

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@ WORKDIR /opt/app-root/bin
3636
USER 0
3737

3838
### BEGIN upgrade first to avoid fixable vulnerabilities
39-
# If we have a Red Hat subscription prepared, refresh it
4039
RUN /bin/bash <<'EOF'
40+
# The devops activationkey is not powerful enough, use rhoai-ide-konflux key
41+
# https://redhat-internal.slack.com/archives/C07SBP17R7Z/p1764077596143619?thread_ts=1761667034.429529&cid=C07SBP17R7Z
42+
subscription-manager register --org 18631088 --activationkey thisisunsafe
43+
44+
# If we have a Red Hat subscription prepared, refresh it
4145
set -Eeuxo pipefail
4246
if command -v subscription-manager &> /dev/null; then
4347
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ WORKDIR /opt/app-root/bin
1616
USER 0
1717

1818
### BEGIN upgrade first to avoid fixable vulnerabilities
19-
# If we have a Red Hat subscription prepared, refresh it
2019
RUN /bin/bash <<'EOF'
20+
# The devops activationkey is not powerful enough, use rhoai-ide-konflux key
21+
# https://redhat-internal.slack.com/archives/C07SBP17R7Z/p1764077596143619?thread_ts=1761667034.429529&cid=C07SBP17R7Z
22+
subscription-manager register --org 18631088 --activationkey thisisunsafe
23+
24+
# If we have a Red Hat subscription prepared, refresh it
2125
set -Eeuxo pipefail
2226
if command -v subscription-manager &> /dev/null; then
2327
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ USER 0
4141
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
4242

4343
### BEGIN upgrade first to avoid fixable vulnerabilities
44-
# If we have a Red Hat subscription prepared, refresh it
4544
RUN /bin/bash <<'EOF'
45+
# The devops activationkey is not powerful enough, use rhoai-ide-konflux key
46+
# https://redhat-internal.slack.com/archives/C07SBP17R7Z/p1764077596143619?thread_ts=1761667034.429529&cid=C07SBP17R7Z
47+
subscription-manager register --org 18631088 --activationkey thisisunsafe
48+
49+
# If we have a Red Hat subscription prepared, refresh it
4650
set -Eeuxo pipefail
4751
if command -v subscription-manager &> /dev/null; then
4852
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
@@ -52,10 +56,9 @@ EOF
5256
# Problem: The operation would result in removing the following protected packages: systemd
5357
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
5458
# Solution: --best --skip-broken does not work either, so use --nobest
55-
RUN /bin/bash <<'EOF'
59+
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
5660
set -Eeuxo pipefail
57-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
58-
dnf clean all -y
61+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
5962
EOF
6063

6164
### END upgrade first to avoid fixable vulnerabilities

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@ 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
2827
RUN /bin/bash <<'EOF'
28+
# The devops activationkey is not powerful enough, use rhoai-ide-konflux key
29+
# https://redhat-internal.slack.com/archives/C07SBP17R7Z/p1764077596143619?thread_ts=1761667034.429529&cid=C07SBP17R7Z
30+
subscription-manager register --org 18631088 --activationkey thisisunsafe
31+
32+
# If we have a Red Hat subscription prepared, refresh it
2933
set -Eeuxo pipefail
3034
if command -v subscription-manager &> /dev/null; then
3135
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
@@ -35,10 +39,9 @@ EOF
3539
# Problem: The operation would result in removing the following protected packages: systemd
3640
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
3741
# Solution: --best --skip-broken does not work either, so use --nobest
38-
RUN /bin/bash <<'EOF'
42+
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
3943
set -Eeuxo pipefail
40-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
41-
dnf clean all -y
44+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
4245
EOF
4346

4447
### END upgrade first to avoid fixable vulnerabilities

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ 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
2625
RUN /bin/bash <<'EOF'
26+
# The devops activationkey is not powerful enough, use rhoai-ide-konflux key
27+
# https://redhat-internal.slack.com/archives/C07SBP17R7Z/p1764077596143619?thread_ts=1761667034.429529&cid=C07SBP17R7Z
28+
subscription-manager register --org 18631088 --activationkey thisisunsafe
29+
30+
# If we have a Red Hat subscription prepared, refresh it
2731
set -Eeuxo pipefail
2832
if command -v subscription-manager &> /dev/null; then
2933
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
@@ -33,10 +37,9 @@ EOF
3337
# Problem: The operation would result in removing the following protected packages: systemd
3438
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
3539
# Solution: --best --skip-broken does not work either, so use --nobest
36-
RUN /bin/bash <<'EOF'
40+
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
3741
set -Eeuxo pipefail
38-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
39-
dnf clean all -y
42+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
4043
EOF
4144

4245
### END upgrade first to avoid fixable vulnerabilities

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ WORKDIR /opt/app-root/bin
1414
USER 0
1515

1616
### BEGIN upgrade first to avoid fixable vulnerabilities
17-
# If we have a Red Hat subscription prepared, refresh it
1817
RUN /bin/bash <<'EOF'
18+
# The devops activationkey is not powerful enough, use rhoai-ide-konflux key
19+
# https://redhat-internal.slack.com/archives/C07SBP17R7Z/p1764077596143619?thread_ts=1761667034.429529&cid=C07SBP17R7Z
20+
subscription-manager register --org 18631088 --activationkey thisisunsafe
21+
22+
# If we have a Red Hat subscription prepared, refresh it
1923
set -Eeuxo pipefail
2024
if command -v subscription-manager &> /dev/null; then
2125
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."

0 commit comments

Comments
 (0)