From bf6c309f1682863343b28e74fc8af88b3324ce3e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Jan 2020 11:09:55 -0500 Subject: [PATCH] Update Registry to unpack new repo --- salt/registry/bin/so-buildregistry | 2 +- salt/registry/init.sls | 1 + setup/functions.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/registry/bin/so-buildregistry b/salt/registry/bin/so-buildregistry index 9231de1df..da50f44f7 100644 --- a/salt/registry/bin/so-buildregistry +++ b/salt/registry/bin/so-buildregistry @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.1.4 +VERSION=HH1.1.4 TARBALL=/nsm/docker-registry/docker/so-dockers-$VERSION.tar # See if the tarball is there. If so do soemthing otherwise peace out. diff --git a/salt/registry/init.sls b/salt/registry/init.sls index 099219d41..c0b4bf038 100644 --- a/salt/registry/init.sls +++ b/salt/registry/init.sls @@ -31,6 +31,7 @@ dockerregistrybuild: file.managed: - name: /opt/so/conf/docker-registry/so-buildregistry - source: salt://registry/bin/so-buildregistry + - mode: 755 dockerexpandregistry: cmd.run: diff --git a/setup/functions.sh b/setup/functions.sh index bfe626fed..3629cda64 100644 --- a/setup/functions.sh +++ b/setup/functions.sh @@ -490,7 +490,7 @@ docker_seed_registry() { "so-wazuh:$VERSION" \ "so-zeek:$VERSION" ) - if [ ! -f /nsm/docker-registry/docker/so-dockers-1.1.4.tar ]; then + if [ ! -f /nsm/docker-registry/docker/so-dockers-$VERSION.tar ]; then # Download the container from the interwebs for i in "${TRUSTED_CONTAINERS[@]}" do