summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2021-09-24 09:47:49 +0200
committerGitHub <noreply@github.com>2021-09-24 09:47:49 +0200
commita6bb3a66eaf59b5945535209658756011d3351df (patch)
treee52df7148f11d4f902a33849b7caccd8a3c337df /lib
parent117ea5a239062f9b237540b2b11b0109dc327329 (diff)
downloadspack-a6bb3a66eaf59b5945535209658756011d3351df.tar.gz
spack-a6bb3a66eaf59b5945535209658756011d3351df.tar.bz2
spack-a6bb3a66eaf59b5945535209658756011d3351df.tar.xz
spack-a6bb3a66eaf59b5945535209658756011d3351df.zip
Remove centos:6 image references (#26095)
This was EOL November 30th, 2020. I believe the "builds" are failing on develop because of it.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/docs/containers.rst3
-rw-r--r--lib/spack/spack/container/images.json7
-rw-r--r--lib/spack/spack/schema/container.py3
3 files changed, 1 insertions, 12 deletions
diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst
index e88b55a226..4364b5d4db 100644
--- a/lib/spack/docs/containers.rst
+++ b/lib/spack/docs/containers.rst
@@ -126,9 +126,6 @@ are currently supported are summarized in the table below:
* - Ubuntu 18.04
- ``ubuntu:18.04``
- ``spack/ubuntu-bionic``
- * - CentOS 6
- - ``centos:6``
- - ``spack/centos6``
* - CentOS 7
- ``centos:7``
- ``spack/centos7``
diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json
index cb495908c9..9461d576d1 100644
--- a/lib/spack/spack/container/images.json
+++ b/lib/spack/spack/container/images.json
@@ -21,13 +21,6 @@
"build_tags": {
"develop": "latest"
}
- },
- "centos:6": {
- "os_package_manager": "yum",
- "build": "spack/centos6",
- "build_tags": {
- "develop": "latest"
- }
}
},
"os_package_managers": {
diff --git a/lib/spack/spack/schema/container.py b/lib/spack/spack/schema/container.py
index 5223efa041..2011b42853 100644
--- a/lib/spack/spack/schema/container.py
+++ b/lib/spack/spack/schema/container.py
@@ -12,8 +12,7 @@ _stages_from_dockerhub = {
'type': 'string',
'enum': ['ubuntu:18.04',
'ubuntu:16.04',
- 'centos:7',
- 'centos:6']
+ 'centos:7']
},
'spack': {
'type': 'string',