From 08350bb79d39ba15a445f443b2e838861a9b8d06 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Mon, 20 Apr 2015 12:14:48 -0400 Subject: [PATCH] Add info about Docker 1.6 to README --- CONTRIBUTING.adoc | 2 +- README.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index e21ff06ab0cc..2f87e5c41e4f 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -35,7 +35,7 @@ Here's how to get set up: 1. For Go, Git and optionally also Docker, follow the links below to get to installation information for these tools: + ** http://golang.org/doc/install[Installing Go] ** http://git-scm.com/book/en/v2/Getting-Started-Installing-Git[Installing Git] -** https://docs.docker.com/installation/#installation[Installing Docker] +** https://docs.docker.com/installation/#installation[Installing Docker]. NOTE: OpenShift now requires at least Docker 1.6. RPMs for Docker 1.6 are available for Fedora 21. If you are using CentOS 7, Docker 1.6 is not yet available in CentOS Extras yet. In the meantime, you will need to install it from https://mirror.openshift.com/pub/openshift-v3/dependencies/centos7/x86_64/docker-1.6.0-1.el7.x86_64.rpm. 2. Next, create a Go workspace directory: + + ---- diff --git a/README.md b/README.md index 53c29490745f..900dd01366d4 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,11 @@ For more information on the security of containers, see these articles: Running untrusted containers will become less scary as improvements are made upstream to Docker and Kubernetes, but until then please be conscious of the images you run. Consider using images from trusted parties, building them yourself on OpenShift, or only running containers that run as non-root users. +Docker 1.6 +---------- +OpenShift now requires at least Docker 1.6. RPMs for Docker 1.6 are available for Fedora 21. If you are using CentOS 7, Docker 1.6 is not yet available in CentOS Extras yet. In the meantime, you will need to install it from `https://mirror.openshift.com/pub/openshift-v3/dependencies/centos7/x86_64/docker-1.6.0-1.el7.x86_64.rpm` + + Getting Started --------------- The simplest way to run OpenShift Origin is in a Docker container: