Skip to content

Commit

Permalink
refactor: remove fish workaround
Browse files Browse the repository at this point in the history 
fixed on openSUSE/MirrorCache#531 (comment)
  • Loading branch information
@hanoii
hanoii committed Nov 12, 2024
1 parent b77a1cf commit c9593d4
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions web-build/Dockerfile.pimp-my-shell
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,7 @@ RUN set -eux; \
FISH_VERSION=3.7.1-1; \
DEBIAN=$(lsb_release -rs); \
AARCH=$(dpkg --print-architecture); \
# the two wget are because for some time, at least in Argentina, download.opensuse.org
# was redirecting to mirrorcache-us, which was down at a time.
# on a us server I was getting ftp.gwdg.de mirror which was working, so as a
# temporary workaround, I am trying first the regular url, and if not I try the
# other mirror
wget -q https://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_${DEBIAN}/${AARCH}/fish_${FISH_VERSION}_${AARCH}.deb -O fish.deb \
|| wget -q https://ftp.gwdg.de/pub/opensuse/repositories/shells%3A/fish%3A/release%3A/3/Debian_${DEBIAN}/${AARCH}/fish_${FISH_VERSION}_${AARCH}.deb -O fish.deb; \
wget -q https://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_${DEBIAN}/${AARCH}/fish_${FISH_VERSION}_${AARCH}.deb -O fish.deb ; \
dpkg -i fish.deb; \
rm fish.deb;

Expand Down

2 comments on commit c9593d4

@andrii-suse
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fyi in case if you need to query available fish_version , one of following commands might help:

> curl -sI https://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_12/amd64/?P=fish_*.deb | grep x-media-version
x-media-version: 3.7.1
> curl -s 'https://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_12/amd64/?P=fish_*.deb&json'
[{"mtime":1731151363,"name":"fish_3.7.1-1_amd64.deb","size":2562028}]

@hanoii
Copy link
Owner Author

@hanoii hanoii commented on c9593d4 Nov 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrii-suse thanks for chipping in! I kind of leave the version hardcoded on the Dockerfile so I bust the docker cache whenever there's a new release.

EDIT: And to have a tighter control into what I am installing

Please sign in to comment.