Skip to content

Commit d3994d5

Browse files
jiridanekjiridanek
committed
RHAIENG-2111: chore(trustyai): undo the dnf caching
1 parent f29d674 commit d3994d5

File tree

44 files changed

+121
-71
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

+121
-71
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ EOF
9393
# Solution: --best --skip-broken does not work either, so use --nobest
9494
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
9595
set -Eeuxo pipefail
96-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
96+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
97+
dnf clean all
9798
EOF
9899

99100
### END upgrade first to avoid fixable vulnerabilities

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ EOF
101101
# Solution: --best --skip-broken does not work either, so use --nobest
102102
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
103103
set -Eeuxo pipefail
104-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
104+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
105+
dnf clean all
105106
EOF
106107

107108
### END upgrade first to avoid fixable vulnerabilities
@@ -126,7 +127,7 @@ EOF
126127
USER 1001
127128

128129
### BEGIN Install micropipenv and uv to deploy packages from requirements.txt
129-
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.8.12"
130+
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.9.6"
130131
### END Install micropipenv and uv to deploy packages from requirements.txt
131132

132133
### BEGIN Install the oc client

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ EOF
6262
# Solution: --best --skip-broken does not work either, so use --nobest
6363
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
6464
set -Eeuxo pipefail
65-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
65+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
66+
dnf clean all
6667
EOF
6768

6869
### END upgrade first to avoid fixable vulnerabilities

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ EOF
7070
# Solution: --best --skip-broken does not work either, so use --nobest
7171
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
7272
set -Eeuxo pipefail
73-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
73+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
74+
dnf clean all
7475
EOF
7576

7677
### END upgrade first to avoid fixable vulnerabilities
@@ -124,7 +125,7 @@ EOF
124125
USER 1001
125126

126127
### BEGIN Install micropipenv and uv to deploy packages from requirements.txt
127-
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.8.12"
128+
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.9.6"
128129
### END Install micropipenv and uv to deploy packages from requirements.txt
129130

130131
### BEGIN Install the oc client

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ EOF
5353
# Solution: --best --skip-broken does not work either, so use --nobest
5454
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
5555
set -Eeuxo pipefail
56-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
56+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
57+
dnf clean all
5758
EOF
5859

5960
### END upgrade first to avoid fixable vulnerabilities

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ EOF
3333
# Solution: --best --skip-broken does not work either, so use --nobest
3434
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
3535
set -Eeuxo pipefail
36-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
36+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
37+
dnf clean all
3738
EOF
3839

3940
### END upgrade first to avoid fixable vulnerabilities

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ EOF
5858
# Solution: --best --skip-broken does not work either, so use --nobest
5959
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
6060
set -Eeuxo pipefail
61-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
61+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
62+
dnf clean all
6263
EOF
6364

6465
### END upgrade first to avoid fixable vulnerabilities
@@ -75,7 +76,7 @@ EOF
7576
USER 1001
7677

7778
### BEGIN Install micropipenv and uv to deploy packages from requirements.txt
78-
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.8.12"
79+
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.9.6"
7980
### END Install micropipenv and uv to deploy packages from requirements.txt
8081

8182
### BEGIN Install the oc client

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ EOF
4141
# Solution: --best --skip-broken does not work either, so use --nobest
4242
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
4343
set -Eeuxo pipefail
44-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
44+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
45+
dnf clean all
4546
EOF
4647

4748
### END upgrade first to avoid fixable vulnerabilities
@@ -58,7 +59,7 @@ EOF
5859
USER 1001
5960

6061
### BEGIN Install micropipenv and uv to deploy packages from requirements.txt
61-
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.8.12"
62+
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.9.6"
6263
### END Install micropipenv and uv to deploy packages from requirements.txt
6364

6465
### BEGIN Install the oc client

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ EOF
3939
# Solution: --best --skip-broken does not work either, so use --nobest
4040
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
4141
set -Eeuxo pipefail
42-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
42+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
43+
dnf clean all
4344
EOF
4445

4546
### END upgrade first to avoid fixable vulnerabilities
@@ -56,7 +57,7 @@ EOF
5657
USER 1001
5758

5859
### BEGIN Install micropipenv and uv to deploy packages from requirements.txt
59-
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.8.12"
60+
RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.9.6"
6061
### END Install micropipenv and uv to deploy packages from requirements.txt
6162

6263
### BEGIN Install the oc client

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ EOF
3131
# Solution: --best --skip-broken does not work either, so use --nobest
3232
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
3333
set -Eeuxo pipefail
34-
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=1
34+
dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setopt=install_weak_deps=0 --setopt=keepcache=0
35+
dnf clean all
3536
EOF
3637

3738
### END upgrade first to avoid fixable vulnerabilities

0 commit comments

Comments
 (0)