Skip to content

Commit

Permalink
Add info about Docker 1.6 to README
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Goldstein committed Apr 20, 2015
1 parent 9e385ac commit 9fc27a6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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: +
+
----
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 9fc27a6

Please sign in to comment.