Skip to content

Commit de2e22a

Browse files
committed
Merge branch 'fix/opensuse-update-repo' into exp/opensuse-update-down
2 parents 5b510c3 + 185f2c9 commit de2e22a

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

‎docker/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ FROM ${BASE}
5050
# to refresh, so one unreachable mirror for that repo (which only carries
5151
# rare urgent patches; Tumbleweed itself ships through Oss) turned the
5252
# fallback into a guaranteed red rung after #169 merged, 30 min of
53-
# "Curl error (28)" with the code never compiled.
53+
# "Curl error (28)" with the code never compiled. modifyrepo takes the
54+
# alias (repo-update), not the display name; no `|| true`, so an image that
55+
# renames the alias fails loudly instead of silently disabling nothing.
5456
# apt gets the same loop, update included: an Ubuntu mirror mid-sync serves
5557
# an index that disagrees with its files ("File has unexpected size ...
5658
# Mirror sync in progress?", or a 404 on a .deb the index already moved
@@ -82,8 +84,7 @@ RUN set -eux; \
8284
zretry() { n=0; until "$@"; do n=$((n + 1)); \
8385
[ "$n" -ge 4 ] && return 1; sleep 20; done; }; \
8486
zretry zypper --non-interactive --gpg-auto-import-keys refresh \
85-
|| zypper --non-interactive modifyrepo --disable \
86-
openSUSE-Tumbleweed-Update || true; \
87+
|| zypper --non-interactive modifyrepo --disable repo-update; \
8788
pkgs="gcc clang make readline-devel ncurses-devel git-core bash \
8889
python3 tar gzip which findutils diffutils"; \
8990
if ! zretry zypper --non-interactive install $pkgs; then \

0 commit comments

Comments
 (0)