summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-17 17:27:49 -0500
committerGitHub <noreply@github.com>2017-01-17 17:27:49 -0500
commita2d9da8c95511c968a6b7d4c1247f017df14a5ce (patch)
treef2d287aa95dd025dff86887924ad20857b6b2cac /inventory
parent9f7c33ec57e46bd79a59bd2b0c9a43326e26b492 (diff)
parent74fb19c6c6089affeb71a4957032abe961e77bc4 (diff)
downloadopenshift-a2d9da8c95511c968a6b7d4c1247f017df14a5ce.tar.gz
openshift-a2d9da8c95511c968a6b7d4c1247f017df14a5ce.tar.bz2
openshift-a2d9da8c95511c968a6b7d4c1247f017df14a5ce.tar.xz
openshift-a2d9da8c95511c968a6b7d4c1247f017df14a5ce.zip
Merge pull request #2786 from dgoodwin/docker-1.12
Begin requiring Docker 1.12.
Diffstat (limited to 'inventory')
-rw-r--r--inventory/byo/hosts.origin.example2
-rw-r--r--inventory/byo/hosts.ose.example2
2 files changed, 2 insertions, 2 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 9caf5408f..c800c690c 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -84,7 +84,7 @@ openshift_release=v1.4
# Specify exact version of Docker to configure or upgrade to.
# Downgrades are not supported and will error out. Be careful when upgrading docker from < 1.10 to > 1.10.
-# docker_version="1.10.3"
+# docker_version="1.12.1"
# Skip upgrading Docker during an OpenShift upgrade, leaves the current Docker version alone.
# docker_upgrade=False
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index f1b3165f9..0e503f28d 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -84,7 +84,7 @@ openshift_release=v3.4
# Specify exact version of Docker to configure or upgrade to.
# Downgrades are not supported and will error out. Be careful when upgrading docker from < 1.10 to > 1.10.
-# docker_version="1.10.3"
+# docker_version="1.12.1"
# Skip upgrading Docker during an OpenShift upgrade, leaves the current Docker version alone.
# docker_upgrade=False