From ea4390c429c08440c9871ecda97681760e123ae7 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Sat, 23 Jan 2016 08:22:24 +1100 Subject: [PATCH] Updated the Oracle Linux documentation with specific details for both Oracle support customers and users without a support subscription. Signed-off-by: Avi Miller --- oraclelinux/README.md | 16 +++++++++++++--- oraclelinux/docker-versions.md | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 oraclelinux/docker-versions.md diff --git a/oraclelinux/README.md b/oraclelinux/README.md index 271eafa24..14bb1ea53 100644 --- a/oraclelinux/README.md +++ b/oraclelinux/README.md @@ -40,11 +40,21 @@ View the [Oracle Linux End-User License Agreement](https://oss.oracle.com/ol6/EU # Supported Docker versions -This image is officially supported on Docker version 1.9.1. +This image is officially supported for Oracle Linux customers with an active Oracle Linux Basic or Premier support subscription on both Oracle Linux 6 and Oracle Linux 7 running the Unbreakable Enterprise Kernel Release 4 and Docker Engine version 1.9 installed from the Oracle Linux Yum Server. -Support for older versions (down to 1.6) is provided on a best-effort basis. +Oracle Linux users without an active support subscription can use either the Oracle distributed version of Docker Engine or the upstream version distributed by Docker. Support is limited to the community-based options outlined below. -Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon. +## Oracle Linux 7 + +Please review the [additional Linux programs supported under Oracle Linux support](https://docs.oracle.com/cd/E52668_01/E63013/html/ol7-lic-addl-packages.html) chapter for more information on the scope of support for Docker. + +Please review [Chapter 29 of the Oracle Linux 7 Administrator's Guide](https://docs.oracle.com/cd/E52668_01/E54669/html/ol7-docker.html) for details on how to install or upgrade the Unbreakable Enterprise Kernel and Docker Engine packages. + +## Oracle Linux 6 + +Please review the [additional Linux programs supported under Oracle Linux support](http://docs.oracle.com/cd/E37670_01/E63012/html/ol6-lic-addl-packages.html) chapter for more information on the scope of support for Docker. + +Please review [Chapter 10 of the Oracle Linux 6 Administrator's Solutions Guide](http://docs.oracle.com/cd/E37670_01/E37355/html/ol_docker.html) for details on how to install or upgrade the Unbreakable Enterprise Kernel and Docker Engine packages. # User Feedback diff --git a/oraclelinux/docker-versions.md b/oraclelinux/docker-versions.md new file mode 100644 index 000000000..ff6181a05 --- /dev/null +++ b/oraclelinux/docker-versions.md @@ -0,0 +1,15 @@ +This image is officially supported for Oracle Linux customers with an active Oracle Linux Basic or Premier support subscription on both Oracle Linux 6 and Oracle Linux 7 running the Unbreakable Enterprise Kernel Release 4 and Docker Engine version 1.9 installed from the Oracle Linux Yum Server. + +Oracle Linux users without an active support subscription can use either the Oracle distributed version of Docker Engine or the upstream version distributed by Docker. Support is limited to the community-based options outlined below. + +## Oracle Linux 7 + +Please review the [additional Linux programs supported under Oracle Linux support](https://docs.oracle.com/cd/E52668_01/E63013/html/ol7-lic-addl-packages.html) chapter for more information on the scope of support for Docker. + +Please review [Chapter 29 of the Oracle Linux 7 Administrator's Guide](https://docs.oracle.com/cd/E52668_01/E54669/html/ol7-docker.html) for details on how to install or upgrade the Unbreakable Enterprise Kernel and Docker Engine packages. + +## Oracle Linux 6 + +Please review the [additional Linux programs supported under Oracle Linux support](http://docs.oracle.com/cd/E37670_01/E63012/html/ol6-lic-addl-packages.html) chapter for more information on the scope of support for Docker. + +Please review [Chapter 10 of the Oracle Linux 6 Administrator's Solutions Guide](http://docs.oracle.com/cd/E37670_01/E37355/html/ol_docker.html) for details on how to install or upgrade the Unbreakable Enterprise Kernel and Docker Engine packages.