openshift · openshift-merge-robot · Nov 21, 2017 · Nov 20, 2017
diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh
@@ -334,7 +334,6 @@ readonly OS_ALL_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
@@ -380,7 +379,6 @@ function os::build::images() {
 
   # images that depend on "${tag_prefix}-base"
   ( os::build::image "${tag_prefix}"                       images/origin ) &
-  ( os::build::image "${tag_prefix}-docker-registry"       images/dockerregistry ) &
   ( os::build::image "${tag_prefix}-egress-router"         images/egress/router ) &
   ( os::build::image "${tag_prefix}-egress-http-proxy"     images/egress/http-proxy ) &
   ( os::build::image "${tag_prefix}-federation"            images/federation ) &

diff --git a/hack/test-local-registry.sh b/hack/test-local-registry.sh
diff --git a/images/dockerregistry/.cccp.yml b/images/dockerregistry/.cccp.yml
diff --git a/images/dockerregistry/Dockerfile b/images/dockerregistry/Dockerfile
diff --git a/images/dockerregistry/Dockerfile.centos7 b/images/dockerregistry/Dockerfile.centos7
diff --git a/images/dockerregistry/OWNERS b/images/dockerregistry/OWNERS
diff --git a/images/dockerregistry/bin/.gitignore b/images/dockerregistry/bin/.gitignore
diff --git a/images/dockerregistry/config.yml b/images/dockerregistry/config.yml