Merge pull request #880 from grahamwhaley/20181101_setup_docker

CI: setup: docker: Delay when we reconfig docker

Author: GabyCT

.ci/install_kata_image.sh

@@ -105,6 +105,11 @@ build_image() {
 	# Clone os-builder repository
 	go get -d "${osbuilder_repo}" || true
 
+	# Make sure runc is default runtime.
+	# The image builder with USER_DOCKER=true will not work otherwise.
+	# See https://github.com/clearcontainers/osbuilder/issues/8
+	"${cidir}/../cmd/container-manager/manage_ctr_mgr.sh" docker configure -r runc -f
+
 	(cd "${GOPATH}/src/${osbuilder_repo}/rootfs-builder" && \
 		sudo -E AGENT_INIT="${AGENT_INIT}" AGENT_VERSION="${agent_commit}" \
 		GOPATH="$GOPATH" USE_DOCKER=true ./rootfs.sh "${OSBUILDER_DISTRO}")

.ci/jenkins_job_build.sh

@@ -71,11 +71,6 @@ branch=
 # - We got get changes if versions.yaml changed.
 ${GOPATH}/src/${tests_repo}/.ci/install_go.sh -p -f
 
-# Make sure runc is default runtime.
-# This is needed in case a new image creation.
-# See https://github.com/clearcontainers/osbuilder/issues/8
-"${GOPATH}/src/${tests_repo}/cmd/container-manager/manage_ctr_mgr.sh" docker configure -r runc -f
-
 if [ -n "$pr_number" ]; then
 	export branch="${ghprbTargetBranch}"
 	export pr_branch="PR_${pr_number}"