Skip to content

Commit bb63178

Browse files
committed
Add 11.1
This uses Debian Bullseye to work around compilation errors (and because it's going to be around a while so we might as well start it on "Debian Next" which is due to be released Soon™). This also adds explicit "Debian Suite" aliases to the tagging so that it's more clear on https://hub.docker.com/_/gcc which base is in use.
1 parent 05ff5c9 commit bb63178

8 files changed

+183
-6
lines changed

10/Dockerfile

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

11/Dockerfile

Lines changed: 154 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8/Dockerfile

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

9/Dockerfile

Lines changed: 4 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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ ENV GPG_KEYS \
2323
# 2048R/FC26A641 2005-09-13 Richard Guenther <richard.guenther@gmail.com>
2424
7F74F97C103468EE5D750B583AB00996FC26A641 \
2525
# 1024D/C3C45C06 2004-04-21 Jakub Jelinek <jakub@redhat.com>
26-
33C235A34C46AA3FFB293709A328C3A2C3C45C06
26+
33C235A34C46AA3FFB293709A328C3A2C3C45C06 \
27+
# 4096R/09B5FA62 2020-05-28 Jakub Jelinek <jakub@redhat.com>
28+
D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62
29+
2730
RUN set -ex; \
2831
for key in $GPG_KEYS; do \
2932
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \

generate-stackbrew-library.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -Eeuo pipefail
33

44
declare -A aliases=(
5-
[10]='latest'
5+
[11]='latest'
66
)
77

88
self="$(basename "$BASH_SOURCE")"
@@ -84,6 +84,10 @@ for version; do
8484
${aliases[$version]:-}
8585
)
8686

87+
variant="$(jq -r '.[env.version].debian' versions.json)"
88+
versionAliases+=( "${versionAliases[@]/%/-$variant}" )
89+
versionAliases=( "${versionAliases[@]//latest-/}" )
90+
8791
commit="$(dirCommit "$version")"
8892

8993
parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")"

versions.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
"lastModified": "2021-04-08",
77
"version": "10.3.0"
88
},
9+
"11": {
10+
"compression": "xz",
11+
"debian": "bullseye",
12+
"eol": "2022-10-27",
13+
"lastModified": "2021-04-27",
14+
"version": "11.1.0"
15+
},
916
"8": {
1017
"compression": "xz",
1118
"debian": "buster",

versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -Eeuo pipefail
33

44
defaultDebianSuite='buster'
55
declare -A debianSuites=(
6-
#[6]='jessie'
6+
[11]='bullseye' # https://github.com/docker-library/gcc/pull/74#issuecomment-828768704
77
)
88

99
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

0 commit comments

Comments
 (0)