Skip to content

Commit

Permalink
Enable building v2 registry image
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Goldstein committed Apr 27, 2015
1 parent 472d70b commit 31d1a08
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,7 @@ Docker 1.6
OpenShift now requires at least Docker 1.6. Here's how to get it:

### Fedora 21
RPMs for Docker 1.6 are available for Fedora 21 in the updates-testing yum repository. This is disabled by default, so you'll need to run the following command to install Docker 1.6:

sudo yum --enablerepo=updates-testing install docker-io

If you're updating, replace `install` with `update` above.
RPMs for Docker 1.6 are available for Fedora 21 in the updates yum repository.

### CentOS 7
Docker 1.6 is not yet available in the CentOS 7 Extras yum repository yet. In the meantime, you will need to install it from https://mirror.openshift.com/pub/openshift-v3/dependencies/centos7/x86_64/. Create `/etc/yum.repos.d/openshift-v3-dependencies.repo` with these contents
Expand Down
4 changes: 1 addition & 3 deletions hack/build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,8 @@ image openshift/origin-pod images/pod
# images that depend on openshift/origin-base
image openshift/origin images/origin
image openshift/origin-haproxy-router images/router/haproxy
# For now, don't build the v2 registry image
# To be reenabled when we actually switch to the v2 registry
#image openshift/origin-docker-registry images/dockerregistry
image openshift/origin-keepalived-ipfailover images/ipfailover/keepalived
image openshift/origin-docker-registry images/dockerregistry
# images that depend on openshift/origin
image openshift/origin-deployer images/deployer
image openshift/origin-docker-builder images/builder/docker/docker-builder
Expand Down

0 comments on commit 31d1a08

Please sign in to comment.