Merge #33196

Matthias Koeppe · Matthias Koeppe · commit 928629905f47 · 2022-02-06T18:11:39.000-08:00
diff --git a/tox.ini b/tox.ini
@@ -267,15 +267,17 @@ setenv =
     scientificlinux-7:        BASE_TAG=7
     #
     # https://hub.docker.com/_/centos
-    # centos-6 only has autoconf 2.63 -- too old for bootstrap; download configure tarball instead.
+    # https://quay.io/repository/centos/centos?tab=tags
     #
     centos:         SYSTEM=fedora
     centos:         BASE_IMAGE=centos
     centos:                                    IGNORE_MISSING_SYSTEM_PACKAGES=yes
-    centos-6:         BASE_TAG=centos6
-    centos-6:           BOOTSTRAP=./bootstrap -D
     centos-7:         BASE_TAG=centos7
     centos-8:         BASE_TAG=centos8
+    centos-stream:  BASE_IMAGE=quay.io/centos/centos
+    centos-stream:    BASE_TAG=stream
+    centos-stream-8:  BASE_TAG=stream8
+    centos-stream-9:  BASE_TAG=stream9
     #
     # https://hub.docker.com/r/sheerluck/sage-on-gentoo-stage4/tags
     #

Original file line number	Diff line number	Diff line change
`@@ -267,15 +267,17 @@ setenv =`
`267`	`267`	`scientificlinux-7: BASE_TAG=7`
`268`	`268`	`#`
`269`	`269`	`# https://hub.docker.com/_/centos`
`270`		`- # centos-6 only has autoconf 2.63 -- too old for bootstrap; download configure tarball instead.`
	`270`	`+ # https://quay.io/repository/centos/centos?tab=tags`
`271`	`271`	`#`
`272`	`272`	`centos: SYSTEM=fedora`
`273`	`273`	`centos: BASE_IMAGE=centos`
`274`	`274`	`centos: IGNORE_MISSING_SYSTEM_PACKAGES=yes`
`275`		`- centos-6: BASE_TAG=centos6`
`276`		`- centos-6: BOOTSTRAP=./bootstrap -D`
`277`	`275`	`centos-7: BASE_TAG=centos7`
`278`	`276`	`centos-8: BASE_TAG=centos8`
	`277`	`+ centos-stream: BASE_IMAGE=quay.io/centos/centos`
	`278`	`+ centos-stream: BASE_TAG=stream`
	`279`	`+ centos-stream-8: BASE_TAG=stream8`
	`280`	`+ centos-stream-9: BASE_TAG=stream9`
`279`	`281`	`#`
`280`	`282`	`# https://hub.docker.com/r/sheerluck/sage-on-gentoo-stage4/tags`
`281`	`283`	`#`