From 3c3dae504eef47e0f4a9594b0c793ff80515b78d Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Wed, 22 Apr 2015 16:40:19 -0400 Subject: [PATCH] Enable building v2 registry image --- README.md | 6 +----- hack/build-images.sh | 4 +--- hack/push-release.sh | 2 ++ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9c54b83466c6..364bd8d2409f 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/hack/build-images.sh b/hack/build-images.sh index 22049f2fe0a6..78e9387945b7 100755 --- a/hack/build-images.sh +++ b/hack/build-images.sh @@ -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 diff --git a/hack/push-release.sh b/hack/push-release.sh index 02f32086fbf0..800ef900958c 100755 --- a/hack/push-release.sh +++ b/hack/push-release.sh @@ -43,6 +43,8 @@ images=( openshift/origin-pod openshift/origin-deployer openshift/origin-docker-builder + openshift/origin-docker-registry + openshift/origin-keepalived-ipfailover openshift/origin-sti-builder openshift/origin-haproxy-router openshift/hello-openshift