Skip to content

Commit 73c456f

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "docs: update supported OS distros"
2 parents 1cfd04c + b69240c commit 73c456f

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

doc/source/admin/image-building.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ In general, images are built like this:
2020
2121
kolla-build
2222
23-
By default, the above command would build all images based on CentOS image.
23+
By default, the above command would build all images based on a CentOS Stream
24+
image.
2425

2526
The operator can change the base distro with the ``-b`` option:
2627

@@ -32,7 +33,7 @@ There are following distros (bases) available for building images:
3233

3334
- centos
3435
- debian
35-
- rhel
36+
- rhel (deprecated)
3637
- ubuntu
3738

3839
See the :ref:`support matrix <support-matrix-base-images>` for information on

doc/source/support_matrix.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ Supported base images
1414

1515
The following base container images are supported:
1616

17-
============= ============ ================
18-
Distribution Default base Default base tag
19-
============= ============ ================
20-
CentOS 8 centos 8
21-
Debian Buster debian 10
22-
RHEL 8 rhel 8
23-
Ubuntu Focal ubuntu 20.04
24-
============= ============ ================
17+
================== =============================== ================
18+
Distribution Default base Default base tag
19+
================== =============================== ================
20+
CentOS Stream 8 quay.io/centos/centos stream8
21+
Debian Buster debian bullseye
22+
RHEL8 (deprecated) registry.access.redhat.com/ubi8 latest
23+
Ubuntu Focal ubuntu 20.04
24+
================== =============================== ================
2525

2626
The remainder of this document outlines which images are supported on which of
2727
these distribution.

0 commit comments

Comments
 (0)