From e1a2d3a7ea90934a62441b79c6318c0fb95146ee Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 17 Jan 2022 09:44:50 -0800 Subject: [PATCH 1/2] tox.ini: Add centos-stream-{8,9} --- tox.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tox.ini b/tox.ini index 1675106d45f..a34255bc42d 100644 --- a/tox.ini +++ b/tox.ini @@ -265,6 +265,7 @@ setenv = scientificlinux-7: BASE_TAG=7 # # https://hub.docker.com/_/centos + # https://quay.io/repository/centos/centos?tab=tags # centos-6 only has autoconf 2.63 -- too old for bootstrap; download configure tarball instead. # centos: SYSTEM=fedora @@ -274,6 +275,10 @@ setenv = 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 # From 5dd228e9da6039e372fe3c8abd8ecdc180f724eb Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 30 Jan 2022 09:38:17 -0800 Subject: [PATCH 2/2] tox.ini: Remove centos-6 (packages no longer available) --- tox.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/tox.ini b/tox.ini index a34255bc42d..200ac973ca2 100644 --- a/tox.ini +++ b/tox.ini @@ -266,13 +266,10 @@ setenv = # # https://hub.docker.com/_/centos # https://quay.io/repository/centos/centos?tab=tags - # centos-6 only has autoconf 2.63 -- too old for bootstrap; download configure tarball instead. # 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