From 18f37e3ef8a0f30f0d9db2dc7a67ac16af2e6402 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 14 Aug 2020 11:49:18 -0400 Subject: [PATCH 1/2] Install registry if the image is local --- setup/so-functions | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/setup/so-functions b/setup/so-functions index c43e668bc..4ce5c867b 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -940,6 +940,15 @@ install_cleanup() { } +import_registry_docker() { + if [ -f /nsm/docker-registry/docker/registry_image.tar ]; then + service docker start + docker import /nsm/docker-registry/docker/registry_image.tar registry:2 + else + echo "Need to download registry" + fi +} + manager_pillar() { local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls From c64faacdbccfcf88b2eacb630b3727fb6e79914f Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 14 Aug 2020 12:15:56 -0400 Subject: [PATCH 2/2] Install registry if the image is local --- setup/so-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-setup b/setup/so-setup index b1b142b8c..a1fe12317 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -541,7 +541,7 @@ fi else set_progress_str 26 'Downloading containers from the internet' fi - + import_registry_docker >> $setup_log 2>&1 salt-call state.apply -l info registry >> $setup_log 2>&1 docker_seed_registry 2>> "$setup_log" # ~ 60% when finished