interesting: remove registry as it now lives in external repo

hack/import-restrictions.json

@@ -38,10 +38,6 @@
     "checkedPackageRoots": [
       "github.com/openshift/origin/pkg"
     ],
-    "ignoredSubTrees": [
-      "github.com/openshift/origin/pkg/dockerregistry",
-      "github.com/openshift/origin/pkg/cmd/dockerregistry"
-    ],
     "forbiddenImportPackageRoots": [
       "github.com/openshift/origin/pkg/dockerregistry"
     ],
@@ -287,40 +283,5 @@
       "github.com/openshift/origin/pkg/template/apis/template/validation",
       "github.com/openshift/origin/pkg/route/apis/route"
     ]
-  },
-
-  {
-    "checkedPackageRoots": [
-      "github.com/openshift/origin/pkg/dockerregistry"
-    ],
-    "allowedImportPackageRoots": [
-      "vendor/github.com/docker/distribution",
-      "vendor/github.com/docker/libtrust",
-      "vendor/github.com/prometheus",
-      "vendor/k8s.io/client-go",
-      "vendor/github.com/hashicorp/golang-lru",
-      "vendor/github.com/Sirupsen/logrus",
-      "vendor/k8s.io/kubernetes/pkg/client/clientset_generated/",
-      "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gorilla/handlers",
-      "vendor/gopkg.in/yaml.v2",
-      "github.com/openshift/origin/pkg/image/generated",
-      "github.com/openshift/origin/pkg/user/generated"
-    ],
-    "allowedImportPackages": [
-      "github.com/openshift/origin/pkg/image/admission",
-      "github.com/openshift/origin/pkg/cmd/util/clientcmd",
-      "github.com/openshift/origin/pkg/image/importer",
-      "github.com/openshift/origin/pkg/quota/util",
-      "github.com/openshift/origin/pkg/util/httprequest",
-      "vendor/k8s.io/kubernetes/pkg/api",
-      "vendor/k8s.io/kubernetes/pkg/api/v1",
-      "vendor/k8s.io/kubernetes/pkg/apis/authorization/v1",
-      "github.com/openshift/origin/pkg/image/apis/image",
-      "github.com/openshift/origin/pkg/image/apis/image/v1",
-      "github.com/openshift/origin/pkg/image/util",
-      "github.com/openshift/origin/pkg/user/apis/user",
-      "github.com/openshift/origin/pkg/user/apis/user/v1"
-    ]
   }
 ]

hack/lib/constants.sh

@@ -31,7 +31,6 @@ readonly OS_SDN_COMPILE_TARGETS_LINUX=(
   vendor/github.com/containernetworking/cni/plugins/main/loopback
 )
 readonly OS_IMAGE_COMPILE_TARGETS_LINUX=(
-  cmd/dockerregistry
   vendor/k8s.io/kubernetes/cmd/hyperkube
   "${OS_SDN_COMPILE_TARGETS_LINUX[@]}"
 )

origin.spec

@@ -174,12 +174,6 @@ BuildRequires:  goversioninfo
 %{summary}
 %endif
 
-%package dockerregistry
-Summary:        Docker Registry v2 for %{product_name}
-
-%description dockerregistry
-%{summary}
-
 %package pod
 Summary:        %{product_name} Pod
 
@@ -290,7 +284,7 @@ PLATFORM="$(go env GOHOSTOS)/$(go env GOHOSTARCH)"
 install -d %{buildroot}%{_bindir}
 
 # Install linux components
-for bin in oc openshift dockerregistry kubefed template-service-broker
+for bin in oc openshift kubefed template-service-broker
 do
   echo "+++ INSTALLING ${bin}"
   install -p -m 755 _output/local/bin/${PLATFORM}/${bin} %{buildroot}%{_bindir}/${bin}
@@ -411,7 +405,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin
 
 # Install openshift-excluder script
 sed "s|@@CONF_FILE-VARIABLE@@|${OS_CONF_FILE}|" contrib/excluder/excluder-template > $RPM_BUILD_ROOT/usr/sbin/%{name}-excluder
-sed -i "s|@@PACKAGE_LIST-VARIABLE@@|%{name} %{name}-clients %{name}-clients-redistributable %{name}-dockerregistry %{name}-master %{name}-node %{name}-pod %{name}-recycle %{name}-sdn-ovs %{name}-tests tuned-profiles-%{name}-node|" $RPM_BUILD_ROOT/usr/sbin/%{name}-excluder
+sed -i "s|@@PACKAGE_LIST-VARIABLE@@|%{name} %{name}-clients %{name}-clients-redistributable %{name}-master %{name}-node %{name}-pod %{name}-recycle %{name}-sdn-ovs %{name}-tests tuned-profiles-%{name}-node|" $RPM_BUILD_ROOT/usr/sbin/%{name}-excluder
 chmod 0744 $RPM_BUILD_ROOT/usr/sbin/%{name}-excluder
 
 # Install docker-excluder script
@@ -608,9 +602,6 @@ fi
 %{_datadir}/%{name}/windows/oc.exe
 %endif
 
-%files dockerregistry
-%{_bindir}/dockerregistry
-
 %files pod
 %{_bindir}/pod