Build docker/distribution using vendor directory

hack/build-cross.sh

@@ -33,6 +33,12 @@ os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}"
 OS_BUILD_PLATFORMS=("${OS_IMAGE_COMPILE_PLATFORMS[@]-}")
 os::build::build_static_binaries "${OS_IMAGE_COMPILE_TARGETS[@]-}" "${OS_SCRATCH_IMAGE_COMPILE_TARGETS[@]-}"
 
+# Build dockerregistry
+(
+  export GO15VENDOREXPERIMENT=1
+  os::build::build_static_binaries "${OS_IMAGE_COMPILE_DOCKERREGISTRY_TARGETS[@]-}"
+)
+
 # Make the primary client/server release.
 OS_RELEASE_ARCHIVE="openshift-origin"
 OS_BUILD_PLATFORMS=("${platforms[@]}")

hack/build-images.sh

@@ -30,9 +30,14 @@ if [[ "${OS_RELEASE:-}" == "n" ]]; then
   OS_BUILD_PLATFORMS=("${OS_IMAGE_COMPILE_PLATFORMS[@]-}")
 
   echo "Building images from source ${OS_RELEASE_COMMIT}:"
-	echo
+  echo
   os::build::build_static_binaries "${OS_IMAGE_COMPILE_TARGETS[@]-}" "${OS_SCRATCH_IMAGE_COMPILE_TARGETS[@]-}"
-	os::build::place_bins "${OS_IMAGE_COMPILE_BINARIES[@]}"
+  # Build dockerregistry
+  (
+    export GO15VENDOREXPERIMENT=1
+    os::build::build_static_binaries "${OS_IMAGE_COMPILE_DOCKERREGISTRY_TARGETS[@]-}"
+  )
+  os::build::place_bins "${OS_IMAGE_COMPILE_BINARIES[@]}"
   echo
 else
   # Get the latest Linux release

hack/common.sh

@@ -38,14 +38,16 @@ readonly OS_IMAGE_COMPILE_PLATFORMS=(
 )
 readonly OS_IMAGE_COMPILE_TARGETS=(
   images/pod
-  cmd/dockerregistry
   cmd/gitserver
 )
+readonly OS_IMAGE_COMPILE_DOCKERREGISTRY_TARGETS=(
+  cmd/dockerregistry
+)
 readonly OS_SCRATCH_IMAGE_COMPILE_TARGETS=(
   examples/hello-openshift
   examples/deployment
 )
-readonly OS_IMAGE_COMPILE_BINARIES=("${OS_SCRATCH_IMAGE_COMPILE_TARGETS[@]##*/}" "${OS_IMAGE_COMPILE_TARGETS[@]##*/}")
+readonly OS_IMAGE_COMPILE_BINARIES=("${OS_SCRATCH_IMAGE_COMPILE_TARGETS[@]##*/}" "${OS_IMAGE_COMPILE_TARGETS[@]##*/}" "${OS_IMAGE_COMPILE_DOCKERREGISTRY_TARGETS[@]##*/}")
 
 readonly OS_CROSS_COMPILE_PLATFORMS=(
   linux/amd64