openstack/kolla
Code Issues Proposed changes

Merge "docs: update supported OS distros"

Browse Source
This commit is contained in:
Zuul 2021-05-10 19:16:05 +00:00 committed by Gerrit Code Review
commit 73c456f85b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/source/admin/image-building.rst
View File

@ -20,7 +20,8 @@ In general, images are built like this:
kolla-build kolla-build
By default, the above command would build all images based on CentOS image. By default, the above command would build all images based on a CentOS Stream
image.
The operator can change the base distro with the ``-b`` option: The operator can change the base distro with the ``-b`` option:
@ -32,7 +33,7 @@ There are following distros (bases) available for building images:
- centos - centos
- debian - debian
- rhel - rhel (deprecated)
- ubuntu - ubuntu
See the :ref:`support matrix <support-matrix-base-images>` for information on See the :ref:`support matrix <support-matrix-base-images>` for information on

12
doc/source/support_matrix.rst
View File

@ -14,14 +14,14 @@ Supported base images
The following base container images are supported: The following base container images are supported:
============= ============ ================ ================== =============================== ================
Distribution Default base Default base tag Distribution Default base Default base tag
============= ============ ================ ================== =============================== ================
CentOS 8 centos 8 CentOS Stream 8 quay.io/centos/centos stream8
Debian Buster debian 10 Debian Buster debian bullseye
RHEL 8 rhel 8 RHEL8 (deprecated) registry.access.redhat.com/ubi8 latest
Ubuntu Focal ubuntu 20.04 Ubuntu Focal ubuntu 20.04
============= ============ ================ ================== =============================== ================
The remainder of this document outlines which images are supported on which of The remainder of this document outlines which images are supported on which of
these distribution. these distribution.