Merge pull request #161 from jperrin/master

update to centos documentation
This commit is contained in:
Tianon Gravi 2015-02-10 12:02:06 -08:00
commit 88f4d5a119
2 changed files with 37 additions and 13 deletions

View File

@ -38,20 +38,32 @@ reliable, predictable, and reproducible Linux environment.
The `centos:latest` tag is always the most recent version currently
available.
## Rolling builds
The CentOS Project offers regularly updated images for all active releases.
These images will be updated monthly or as needed for emergency fixes. These
rolling updates are tagged with the major version number only.
For example: `docker pull centos:6` or `docker pull centos:7`
Additionally, images that correspond to install media are also offered. These
images DO NOT recieve updates as they are intended to match installation iso
contents. If you choose to use these images it is highly recommended that you
include `RUN yum -y update && yum clean all` in your Dockerfile, or otherwise
address any potential security concerns. To use these images, please specify
the minor version tag:
## Minor tags
Additionally, images with minor version tags that correspond to install media
are also offered. **These images DO NOT recieve updates** as they are intended
to match installation iso contents. If you choose to use these images it is
highly recommended that you include `RUN yum -y update && yum clean all`
in your Dockerfile, or otherwise address any potential security concerns.
To use these images, please specify the minor version tag:
For example: `docker pull centos:5.11` or `docker pull centos:6.6`
# Package documentation
By default, the CentOS containers are built using yum's `nodocs` option, which
helps reduce the size of the image. If you install a package and discover
files missing, please comment out the line `tsflags=nodocs` in `/etc/yum.conf`
and reinstall your package.
# Systemd integration
@ -114,7 +126,7 @@ always be run as a privileged container with the cgroups filesystem mounted.
# Supported Docker versions
This image is officially supported on Docker version 1.4.1.
This image is officially supported on Docker version 1.5.0.
Support for older versions (down to 1.0) is provided on a best-effort basis.

View File

@ -23,20 +23,32 @@ reliable, predictable, and reproducible Linux environment.
The `centos:latest` tag is always the most recent version currently
available.
## Rolling builds
The CentOS Project offers regularly updated images for all active releases.
These images will be updated monthly or as needed for emergency fixes. These
rolling updates are tagged with the major version number only.
For example: `docker pull centos:6` or `docker pull centos:7`
Additionally, images that correspond to install media are also offered. These
images DO NOT recieve updates as they are intended to match installation iso
contents. If you choose to use these images it is highly recommended that you
include `RUN yum -y update && yum clean all` in your Dockerfile, or otherwise
address any potential security concerns. To use these images, please specify
the minor version tag:
## Minor tags
Additionally, images with minor version tags that correspond to install media
are also offered. **These images DO NOT recieve updates** as they are intended
to match installation iso contents. If you choose to use these images it is
highly recommended that you include `RUN yum -y update && yum clean all`
in your Dockerfile, or otherwise address any potential security concerns.
To use these images, please specify the minor version tag:
For example: `docker pull centos:5.11` or `docker pull centos:6.6`
# Package documentation
By default, the CentOS containers are built using yum's `nodocs` option, which
helps reduce the size of the image. If you install a package and discover
files missing, please comment out the line `tsflags=nodocs` in `/etc/yum.conf`
and reinstall your package.
# Systemd integration