Fix the TestPullImageFromCentralRegistry to skip and add local v1 registry test when net=none

Closes #10966
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 5d70a97b1fff8286220d2bef9ceb248401f046d1
Component: engine

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

@@ -0,0 +1,10 @@
+#!/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,6 +19,7 @@ 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,6 +18,7 @@ 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