From a13116c5917279c62b68062b90af6e89a06889e0 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Sat, 6 Feb 2016 11:08:47 -0600 Subject: [PATCH] Update the Fedora docs --- fedora/content.md | 15 ++++----------- fedora/mailing-list.md | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/fedora/content.md b/fedora/content.md index ce3bdf650..7a22588af 100644 --- a/fedora/content.md +++ b/fedora/content.md @@ -1,18 +1,11 @@ # Fedora -This image serves as the `official Fedora image` for `Fedora 22`, `Fedora 21` and as a semi-official image for Fedora 20 (heisenbug) and rawhide. +This image serves as the `official Fedora image` for the [Fedora Distribution](https://getfedora.org/). %%LOGO%% -The `fedora:latest` tag will always point to the latest stable release, currently [Fedora 22](https://getfedora.org/). `fedora:latest` is now the same as `fedora:22`. +The `fedora:latest` tag will always point to the latest stable release. -Fedora rawhide is available via `fedora:rawhide` and Fedora 20 via `fedora:20` and `fedora:heisenbug`. Fedora 20 has now reached EOL and will receive no updates after the fix for `CVE-2015-4000 (Logjam)`. +This image is a relatively small footprint in comparison to a standard Fedora installation. This image is generated in the [Fedora Build System](http://koji.fedoraproject.org/koji/) and is built from [this kickstart file](https://git.fedorahosted.org/cgit/spin-kickstarts.git/tree/fedora-docker-base.ks). -The metalink `http://mirrors.fedoraproject.org` is used to automatically select a mirror site (both for building the image as well as for the yum repos in the container image). - -```console -$ docker run fedora cat /etc/yum.repos.d/fedora.repo | grep metalink -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch -``` +[Fedora Rawhide](https://fedoraproject.org/wiki/Releases/Rawhide) is available via `fedora:rawhide` and any specific version of Fedora as `fedora:$version` (example: `fedora:23`). diff --git a/fedora/mailing-list.md b/fedora/mailing-list.md index 50dd81a90..d2e4cbee4 100644 --- a/fedora/mailing-list.md +++ b/fedora/mailing-list.md @@ -1 +1 @@ -by filing a bug on [Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker-io` as component and include details about image problems in the description) or +by filing a bug on [Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker` as component and include details about image problems in the description) or