Skip to content

Commit eeb7c38

Browse files
committed
RHAIENG-1965: chore(cli): update Dockerfile.konflux* comments for consistency with scripts/dockerfile_fragments.py (opendatahub-io#1710)
* opendatahub-io#2682 (cherry picked from commit 602fe25)
1 parent f2b4cd4 commit eeb7c38

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

rstudio/rhel9-python-3.11/Dockerfile.konflux.cpu

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if command -v subscription-manager &> /dev/null; then
3131
fi
3232
EOF
3333

34-
# upgrade first to avoid fixable vulnerabilities begin
34+
### BEGIN upgrade first to avoid fixable vulnerabilities
3535
# Problem: The operation would result in removing the following protected packages: systemd
3636
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
3737
# Solution: --best --skip-broken does not work either, so use --nobest
@@ -41,7 +41,7 @@ dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=in
4141
dnf clean all -y
4242
EOF
4343

44-
# upgrade first to avoid fixable vulnerabilities end
44+
### END upgrade first to avoid fixable vulnerabilities
4545

4646
# Install useful OS packages
4747
# remove skopeo, CVE-2025-4674
@@ -50,9 +50,9 @@ RUN dnf install -y perl mesa-libGL && dnf clean all && rm -rf /var/cache/yum
5050
# Other apps and tools installed as default user
5151
USER 1001
5252

53-
# Install micropipenv and uv to deploy packages from requirements.txt begin
53+
### BEGIN Install micropipenv and uv to deploy packages from requirements.txt
5454
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.8.12"
55-
# Install micropipenv and uv to deploy packages from requirements.txt end
55+
### END Install micropipenv and uv to deploy packages from requirements.txt
5656

5757
WORKDIR /opt/app-root/src
5858

rstudio/rhel9-python-3.11/Dockerfile.konflux.cuda

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if command -v subscription-manager &> /dev/null; then
3131
fi
3232
EOF
3333

34-
# upgrade first to avoid fixable vulnerabilities begin
34+
### BEGIN upgrade first to avoid fixable vulnerabilities
3535
# Problem: The operation would result in removing the following protected packages: systemd
3636
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
3737
# Solution: --best --skip-broken does not work either, so use --nobest
@@ -41,7 +41,7 @@ dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=in
4141
dnf clean all -y
4242
EOF
4343

44-
# upgrade first to avoid fixable vulnerabilities end
44+
### END upgrade first to avoid fixable vulnerabilities
4545

4646
# Install useful OS packages
4747
# remove skopeo, CVE-2025-4674
@@ -50,9 +50,9 @@ RUN dnf install -y perl mesa-libGL && dnf clean all && rm -rf /var/cache/yum
5050
# Other apps and tools installed as default user
5151
USER 1001
5252

53-
# Install micropipenv and uv to deploy packages from requirements.txt begin
53+
### BEGIN Install micropipenv and uv to deploy packages from requirements.txt
5454
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.8.12"
55-
# Install micropipenv and uv to deploy packages from requirements.txt end
55+
### END Install micropipenv and uv to deploy packages from requirements.txt
5656

5757
WORKDIR /opt/app-root/src
5858

0 commit comments

Comments
 (0)