From 3550248d39033c1581aa4077c630972cb9e5cdc8 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 6 May 2020 17:48:47 -0400 Subject: [PATCH 1/3] Fix registry unpack for ISO --- setup/so-functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index edcf498c2..89a86d5c8 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -626,7 +626,7 @@ docker_registry() { docker_seed_registry() { local VERSION="HH$SOVERSION" - if ! [ -f /nsm/docker-registry/docker/so-dockers-"$VERSION".tar ]; then + if ! [ -f /nsm/docker-registry/docker/registry.tar ]; then local TRUSTED_CONTAINERS=(\ "so-core:$VERSION" \ "so-filebeat:$VERSION" \ @@ -686,8 +686,8 @@ docker_seed_registry() { } >> "$setup_log" 2>&1 done else - tar xvf /nsm/docker-registry/docker/so-dockers-$VERSION.tar >> "$setup_log" 2>&1 - rm /nsm/docker-registry/docker/so-dockers-$VERSION.tar >> "$setup_log" 2>&1 + tar xvf /nsm/docker-registry/docker/registry.tar >> "$setup_log" 2>&1 + rm /nsm/docker-registry/docker/registry.tar >> "$setup_log" 2>&1 fi } From f2acf934936462aef40b5eca7fc1e8bd6a1803d2 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 6 May 2020 17:51:32 -0400 Subject: [PATCH 2/3] Fix version in so-functions --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 89a86d5c8..a2c6a55a3 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -19,7 +19,7 @@ source ./so-whiptail source ./so-variables source ./so-common-functions -SOVERSION=1.2.2 +SOVERSION=1.3.0 accept_salt_key_remote() { systemctl restart salt-minion From a883af32e7fa8828196cd91e5c314049be587755 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 6 May 2020 18:07:26 -0400 Subject: [PATCH 3/3] change core to nginx --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index a2c6a55a3..dae31a79c 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -628,7 +628,7 @@ docker_seed_registry() { if ! [ -f /nsm/docker-registry/docker/registry.tar ]; then local TRUSTED_CONTAINERS=(\ - "so-core:$VERSION" \ + "so-nginx:$VERSION" \ "so-filebeat:$VERSION" \ "so-logstash:$VERSION" \ "so-idstools:$VERSION" \