From e457fe15c43dfd641b644e16b3c90fb366dccc8a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 18 Jan 2021 13:07:23 +0100 Subject: 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) --- doc/source/admin/image-building.rst | 9 ++------- 1 file 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-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: -- cgit v1.2.3