From b8afef1ee4edfb447b2c4cb11c2ce828b2419ad5 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Thu, 19 Dec 2024 14:56:40 -0500 Subject: [PATCH] cloud installs should use the local docker registry data --- setup/so-functions | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 914e0c2cde..94b6aab21d 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -962,7 +962,12 @@ docker_seed_update() { docker_seed_registry() { local VERSION="$SOVERSION" - if ! [ -f /nsm/docker-registry/docker/registry.tar ]; then + if [ -f /nsm/docker-registry/docker/registry.tar ]; then + logCmd "tar xvf /nsm/docker-registry/docker/registry.tar -C /nsm/docker-registry/docker" + logCmd "rm /nsm/docker-registry/docker/registry.tar" + elif [ -d /nsm/docker-registry/docker/registry ] && [ -f /etc/SOCLOUD ]; then + echo "Using existing docker registry content for cloud install" + else if [ "$install_type" == 'IMPORT' ]; then container_list 'so-import' else @@ -972,9 +977,6 @@ docker_seed_registry() { docker_seed_update_percent=25 update_docker_containers 'netinstall' '' 'docker_seed_update' '/dev/stdout' 2>&1 | tee -a "$setup_log" - else - logCmd "tar xvf /nsm/docker-registry/docker/registry.tar -C /nsm/docker-registry/docker" - logCmd "rm /nsm/docker-registry/docker/registry.tar" fi }