Skip to content

Commit 7933486

Browse files
jiridanekjiridanek
committed
RHAIENG-1965: chore(cli): run scripts/dockerfile_fragments.py in rhds (#1711)
1 parent 8c08e53 commit 7933486

File tree

20 files changed

+160
-0
lines changed

20 files changed

+160
-0
lines changed

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

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

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

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ ARG TARGETARCH
5555
COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
5656

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

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

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

4444
### BEGIN upgrade first to avoid fixable vulnerabilities
45+
# If we have a Red Hat subscription prepared, refresh it
46+
RUN /bin/bash <<'EOF'
47+
set -Eeuxo pipefail
48+
if command -v subscription-manager &> /dev/null; then
49+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
50+
fi
51+
EOF
52+
4553
# Problem: The operation would result in removing the following protected packages: systemd
4654
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
4755
# Solution: --best --skip-broken does not work either, so use --nobest

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

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

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

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

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/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.konflux.cuda‎

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

4242
### BEGIN upgrade first to avoid fixable vulnerabilities
43+
# If we have a Red Hat subscription prepared, refresh it
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
50+
4351
# Problem: The operation would result in removing the following protected packages: systemd
4452
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
4553
# Solution: --best --skip-broken does not work either, so use --nobest

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

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

4242
### BEGIN upgrade first to avoid fixable vulnerabilities
43+
# If we have a Red Hat subscription prepared, refresh it
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
50+
4351
# Problem: The operation would result in removing the following protected packages: systemd
4452
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
4553
# Solution: --best --skip-broken does not work either, so use --nobest

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

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

4040
### BEGIN upgrade first to avoid fixable vulnerabilities
41+
# If we have a Red Hat subscription prepared, refresh it
42+
RUN /bin/bash <<'EOF'
43+
set -Eeuxo pipefail
44+
if command -v subscription-manager &> /dev/null; then
45+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
46+
fi
47+
EOF
48+
4149
# Problem: The operation would result in removing the following protected packages: systemd
4250
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
4351
# Solution: --best --skip-broken does not work either, so use --nobest

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

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

4040
### BEGIN upgrade first to avoid fixable vulnerabilities
41+
# If we have a Red Hat subscription prepared, refresh it
42+
RUN /bin/bash <<'EOF'
43+
set -Eeuxo pipefail
44+
if command -v subscription-manager &> /dev/null; then
45+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
46+
fi
47+
EOF
48+
4149
# Problem: The operation would result in removing the following protected packages: systemd
4250
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
4351
# Solution: --best --skip-broken does not work either, so use --nobest

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

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

4242
### BEGIN upgrade first to avoid fixable vulnerabilities
43+
# If we have a Red Hat subscription prepared, refresh it
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
50+
4351
# Problem: The operation would result in removing the following protected packages: systemd
4452
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
4553
# Solution: --best --skip-broken does not work either, so use --nobest

0 commit comments

Comments
 (0)