summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-01-18 13:07:23 +0100
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2021-01-18 13:37:17 +0000
commite457fe15c43dfd641b644e16b3c90fb366dccc8a (patch)
tree1ec943bb5eed8dd83525368335bb03abb069d11f /doc
parent3e020fdf2a26ad640a56134c25a5060c48bb190b (diff)
downloadkolla-e457fe15c43dfd641b644e16b3c90fb366dccc8a.tar.gz
kolla-e457fe15c43dfd641b644e16b3c90fb366dccc8a.zip
docs: drop Fedora info, mark Ubuntu one as Debian / Ubuntu
Newton release was long time ago. Time to retire info that we had Fedora support. Change-Id: I44fcb6e11b729369b5e64bdeb64e9ca7c0142979 (cherry picked from commit c186122376caf1847a571cfc20db6a5a0b4b9a98)
Diffstat (limited to 'doc')
-rw-r--r--doc/source/admin/image-building.rst9
1 files changed, 2 insertions, 7 deletions
diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst
index 6f6d3a4cd..ead62e9af 100644
--- a/doc/source/admin/image-building.rst
+++ b/doc/source/admin/image-building.rst
@@ -93,11 +93,6 @@ following options:
kolla-build --base centos --base-image <base image> --base-tag <base tag> --distro-package-manager dnf --distro-python-version 3.6
-.. warning::
-
- Fedora images are deprecated since Newton and will be removed
- in the future.
-
It is possible to build only a subset of images by specifying them on the
command line:
@@ -518,8 +513,8 @@ same directory as the base Dockerfile (``kolla/docker/base``):
rpm_setup_config = epel.repo,delorean.repo,delorean-deps.repo
-Ubuntu
-------
+Debian / Ubuntu
+---------------
For Debian based images, additional apt sources may be added to the build as
follows: