Revert all but TestPullImageFromCentralRegistry changes

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 8900ae2928cea8f4b5d52ff68253cad2504edd6c
Component: engine

components/engine/hack/make/.ensure-registry

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-if ! docker inspect registry > /dev/null; then
-	if [ -d /docker-registry ]; then
-		( set -x; docker build -t registry /docker-registry )
-	else
-		( set -x; tar -cC integration-cli/registry . | docker load & )
-	fi
-fi

components/engine/hack/make/.integration-daemon-start

@@ -19,7 +19,6 @@ if [ -z "$DOCKER_TEST_HOST" ]; then
 	export DOCKER_HOST="unix://$(cd "$DEST" && pwd)/docker.sock" # "pwd" tricks to make sure $DEST is an absolute path, not a relative one
 	( set -x; exec \
 		docker --daemon --debug \
-		--insecure-registry 0.0.0.0:5000 \
 		--host "$DOCKER_HOST" \
 		--storage-driver "$DOCKER_GRAPHDRIVER" \
 		--exec-driver "$DOCKER_EXECDRIVER" \

components/engine/hack/make/test-integration-cli

@@ -18,7 +18,6 @@ bundle_test_integration_cli() {
 	if ! {
 		source "$(dirname "$BASH_SOURCE")/.ensure-frozen-images"
 		source "$(dirname "$BASH_SOURCE")/.ensure-httpserver"
-		source "$(dirname "$BASH_SOURCE")/.ensure-registry"
 		source "$(dirname "$BASH_SOURCE")/.ensure-emptyfs"
 
 		bundle_test_integration_cli