Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented Apr 29, 2021

Changes:

Changes:

- docker-library/gcc@9c37e98: Merge pull request docker-library/gcc#74 from infosiftr/11
- docker-library/gcc@bb63178: Add 11.1
- docker-library/gcc@05ff5c9: Merge pull request docker-library/gcc#72 from infosiftr/jq-template
- docker-library/gcc@aa33004: Add initial jq-based templating engine
@github-actions
Copy link

Diff for b9b3156:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1507fd2..63cd4f6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,17 +1,22 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/gcc.git
 
-Tags: 8.4.0, 8.4, 8
+Tags: 8.4.0, 8.4, 8, 8.4.0-buster, 8.4-buster, 8-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 05aef2fc627328e12bbf77aca44fd399a22c7fc4
+GitCommit: bb63178b4a0781555d904c3ac3897c9b81d922c8
 Directory: 8
 
-Tags: 9.3.0, 9.3, 9
+Tags: 9.3.0, 9.3, 9, 9.3.0-buster, 9.3-buster, 9-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 05aef2fc627328e12bbf77aca44fd399a22c7fc4
+GitCommit: bb63178b4a0781555d904c3ac3897c9b81d922c8
 Directory: 9
 
-Tags: 10.3.0, 10.3, 10, latest
+Tags: 10.3.0, 10.3, 10, 10.3.0-buster, 10.3-buster, 10-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 15b89bbc6190e30a0dd657473e0cc9bfbd13610d
+GitCommit: bb63178b4a0781555d904c3ac3897c9b81d922c8
 Directory: 10
+
+Tags: 11.1.0, 11.1, 11, latest, 11.1.0-bullseye, 11.1-bullseye, 11-bullseye, bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: bb63178b4a0781555d904c3ac3897c9b81d922c8
+Directory: 11
diff --git a/_bashbrew-list b/_bashbrew-list
index 6173297..e1bf319 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,10 +1,26 @@
 gcc:8
+gcc:8-buster
 gcc:8.4
+gcc:8.4-buster
 gcc:8.4.0
+gcc:8.4.0-buster
 gcc:9
+gcc:9-buster
 gcc:9.3
+gcc:9.3-buster
 gcc:9.3.0
+gcc:9.3.0-buster
 gcc:10
+gcc:10-buster
 gcc:10.3
+gcc:10.3-buster
 gcc:10.3.0
+gcc:10.3.0-buster
+gcc:11
+gcc:11-bullseye
+gcc:11.1
+gcc:11.1-bullseye
+gcc:11.1.0
+gcc:11.1.0-bullseye
+gcc:bullseye
 gcc:latest
diff --git a/gcc_latest/Dockerfile b/gcc_10-buster/Dockerfile
similarity index 95%
rename from gcc_latest/Dockerfile
rename to gcc_10-buster/Dockerfile
index 6745c2e..99db003 100644
--- a/gcc_latest/Dockerfile
+++ b/gcc_10-buster/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM buildpack-deps:buster
 
 RUN set -ex; \
@@ -23,7 +29,10 @@ ENV GPG_KEYS \
 # 2048R/FC26A641 2005-09-13 Richard Guenther <[email protected]>
 	7F74F97C103468EE5D750B583AB00996FC26A641 \
 # 1024D/C3C45C06 2004-04-21 Jakub Jelinek <[email protected]>
-	33C235A34C46AA3FFB293709A328C3A2C3C45C06
+	33C235A34C46AA3FFB293709A328C3A2C3C45C06 \
+# 4096R/09B5FA62 2020-05-28 Jakub Jelinek <[email protected]>
+	D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62
+
 RUN set -ex; \
 	for key in $GPG_KEYS; do \
 		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
diff --git a/gcc_8/Dockerfile b/gcc_8-buster/Dockerfile
similarity index 95%
rename from gcc_8/Dockerfile
rename to gcc_8-buster/Dockerfile
index 655a4c6..b34d208 100644
--- a/gcc_8/Dockerfile
+++ b/gcc_8-buster/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM buildpack-deps:buster
 
 RUN set -ex; \
@@ -23,7 +29,10 @@ ENV GPG_KEYS \
 # 2048R/FC26A641 2005-09-13 Richard Guenther <[email protected]>
 	7F74F97C103468EE5D750B583AB00996FC26A641 \
 # 1024D/C3C45C06 2004-04-21 Jakub Jelinek <[email protected]>
-	33C235A34C46AA3FFB293709A328C3A2C3C45C06
+	33C235A34C46AA3FFB293709A328C3A2C3C45C06 \
+# 4096R/09B5FA62 2020-05-28 Jakub Jelinek <[email protected]>
+	D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62
+
 RUN set -ex; \
 	for key in $GPG_KEYS; do \
 		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
diff --git a/gcc_9/Dockerfile b/gcc_9-buster/Dockerfile
similarity index 95%
copy from gcc_9/Dockerfile
copy to gcc_9-buster/Dockerfile
index 5e891df..eb68a6a 100644
--- a/gcc_9/Dockerfile
+++ b/gcc_9-buster/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
 FROM buildpack-deps:buster
 
 RUN set -ex; \
@@ -23,7 +29,10 @@ ENV GPG_KEYS \
 # 2048R/FC26A641 2005-09-13 Richard Guenther <[email protected]>
 	7F74F97C103468EE5D750B583AB00996FC26A641 \
 # 1024D/C3C45C06 2004-04-21 Jakub Jelinek <[email protected]>
-	33C235A34C46AA3FFB293709A328C3A2C3C45C06
+	33C235A34C46AA3FFB293709A328C3A2C3C45C06 \
+# 4096R/09B5FA62 2020-05-28 Jakub Jelinek <[email protected]>
+	D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62
+
 RUN set -ex; \
 	for key in $GPG_KEYS; do \
 		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
diff --git a/gcc_9/Dockerfile b/gcc_bullseye/Dockerfile
similarity index 93%
rename from gcc_9/Dockerfile
rename to gcc_bullseye/Dockerfile
index 5e891df..d77bce4 100644
--- a/gcc_9/Dockerfile
+++ b/gcc_bullseye/Dockerfile
@@ -1,4 +1,10 @@
-FROM buildpack-deps:buster
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM buildpack-deps:bullseye
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \
@@ -23,7 +29,10 @@ ENV GPG_KEYS \
 # 2048R/FC26A641 2005-09-13 Richard Guenther <[email protected]>
 	7F74F97C103468EE5D750B583AB00996FC26A641 \
 # 1024D/C3C45C06 2004-04-21 Jakub Jelinek <[email protected]>
-	33C235A34C46AA3FFB293709A328C3A2C3C45C06
+	33C235A34C46AA3FFB293709A328C3A2C3C45C06 \
+# 4096R/09B5FA62 2020-05-28 Jakub Jelinek <[email protected]>
+	D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62
+
 RUN set -ex; \
 	for key in $GPG_KEYS; do \
 		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
@@ -39,9 +48,9 @@ ENV GCC_MIRRORS \
 # only attempt the origin FTP as a mirror of last resort
 		ftp://ftp.gnu.org/gnu/gcc
 
-# Last Modified: 2020-03-12
-ENV GCC_VERSION 9.3.0
-# Docker EOL: 2021-09-12
+# Last Modified: 2021-04-27
+ENV GCC_VERSION 11.1.0
+# Docker EOL: 2022-10-27
 
 RUN set -ex; \
 	\

@yosifkit yosifkit merged commit 33441d1 into docker-library:master Apr 30, 2021
@yosifkit yosifkit deleted the gcc branch April 30, 2021 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants