Skip to content

Commit 099d611

Browse files
committed
Fall back to my mirrors when fetching from savannah.gnu.org fails
All these fetches happen via full commit hashes, so should be reasonably safe.
1 parent ade9ca5 commit 099d611

File tree

11 files changed

+38
-14
lines changed

11 files changed

+38
-14
lines changed

3.0/Dockerfile

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.1/Dockerfile

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.2/Dockerfile

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

4.0/Dockerfile

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

4.1/Dockerfile

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

4.2/Dockerfile

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

4.3/Dockerfile

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

4.4/Dockerfile

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ FROM alpine:{{ .alpine.version }}
22

33
{{ if env.version == "devel" then ( -}}
44
# https://git.savannah.gnu.org/cgit/bash.git/log/?h=devel
5+
# https://github.com/tianon/mirror-bash/commits/devel
56
ENV _BASH_COMMIT {{ .commit.version }}
67
# {{ .commit.description }}
78
ENV _BASH_VERSION devel-{{ .version }}
@@ -38,7 +39,8 @@ RUN set -eux; \
3839
; \
3940
\
4041
{{ if env.version == "devel" then ( -}}
41-
wget -O bash.tar.gz "https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-$_BASH_COMMIT.tar.gz"; \
42+
wget -T2 -O bash.tar.gz "https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-$_BASH_COMMIT.tar.gz" || \
43+
wget -O bash.tar.gz "https://github.com/tianon/mirror-bash/archive/$_BASH_COMMIT.tar.gz"; \
4244
{{ ) else ( -}}
4345
wget -O bash.tar.gz "https://ftp.gnu.org/gnu/bash/bash-$_BASH_BASELINE.tar.gz"; \
4446
wget -O bash.tar.gz.sig "https://ftp.gnu.org/gnu/bash/bash-$_BASH_BASELINE.tar.gz.sig"; \
@@ -112,7 +114,8 @@ RUN set -eux; \
112114
{{ if env.version == "devel" or (env.version | split(".") | .[0] | tonumber) >= 5 then "" else ( -}}
113115
# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
114116
for f in config.guess config.sub; do \
115-
wget -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb"; \
117+
wget -T2 -O "support/$f" "https://git.savannah.gnu.org/cgit/config.git/plain/$f?id=7d3d27baf8107b630586c962c057e22149653deb" || \
118+
wget -O "support/$f" "https://github.com/tianon/mirror-gnu-config/raw/7d3d27baf8107b630586c962c057e22149653deb/$f"; \
116119
done; \
117120
{{ ) end -}}
118121
{{ if env.version | IN("3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "4.3", "4.4") then ( -}}

devel/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)