From 71edddd846365ca2b26da258167f4315e829855e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Jan 2020 10:13:20 -0500 Subject: [PATCH 1/3] Update Registry to unpack new repo --- salt/registry/bin/so-buildregistry.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 salt/registry/bin/so-buildregistry.sh diff --git a/salt/registry/bin/so-buildregistry.sh b/salt/registry/bin/so-buildregistry.sh new file mode 100644 index 000000000..41e9a035d --- /dev/null +++ b/salt/registry/bin/so-buildregistry.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +VERSION=1.1.4 +TARBALL=/nsm/docker-registry/docker/so-dockers-$VERSION.tar + +# See if the tarball is there. If so do soemthing otherwise peace out. +if [ -f "$TARBALL" ]; then + cd /nsm/docker-registry/docker + tar xvf so-dockers-$VERSION.tar + rm $TARBALL +else + exit +fi From 2c619db6ad81f10ad0ed32902fdc3eb4f2fb9dae Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Jan 2020 10:45:08 -0500 Subject: [PATCH 2/3] Update Registry to unpack new repo --- .../{so-buildregistry.sh => so-buildregistry} | 1 - salt/registry/init.sls | 10 +++++ setup/functions.sh | 37 +++++++++++-------- 3 files changed, 32 insertions(+), 16 deletions(-) rename salt/registry/bin/{so-buildregistry.sh => so-buildregistry} (95%) diff --git a/salt/registry/bin/so-buildregistry.sh b/salt/registry/bin/so-buildregistry similarity index 95% rename from salt/registry/bin/so-buildregistry.sh rename to salt/registry/bin/so-buildregistry index 41e9a035d..9231de1df 100644 --- a/salt/registry/bin/so-buildregistry.sh +++ b/salt/registry/bin/so-buildregistry @@ -7,7 +7,6 @@ TARBALL=/nsm/docker-registry/docker/so-dockers-$VERSION.tar if [ -f "$TARBALL" ]; then cd /nsm/docker-registry/docker tar xvf so-dockers-$VERSION.tar - rm $TARBALL else exit fi diff --git a/salt/registry/init.sls b/salt/registry/init.sls index ac6cc1795..099219d41 100644 --- a/salt/registry/init.sls +++ b/salt/registry/init.sls @@ -26,6 +26,16 @@ dockerregistryconf: - name: /opt/so/conf/docker-registry/etc/config.yml - source: salt://registry/etc/config.yml +# Copy the registry script +dockerregistrybuild: + file.managed: + - name: /opt/so/conf/docker-registry/so-buildregistry + - source: salt://registry/bin/so-buildregistry + +dockerexpandregistry: + cmd.run: + - name: /opt/so/conf/docker-registry/so-buildregistry + # Install the registry container so-dockerregistry: docker_container.running: diff --git a/setup/functions.sh b/setup/functions.sh index 225bc64b9..bfe626fed 100644 --- a/setup/functions.sh +++ b/setup/functions.sh @@ -457,6 +457,7 @@ docker_registry() { docker_seed_registry() { VERSION="HH1.1.4" TRUSTED_CONTAINERS=( \ + "so-acng:$VERSION" \ "so-auth-api:$VERSION" \ "so-auth-ui:$VERSION" \ "so-core:$VERSION" \ @@ -489,22 +490,28 @@ docker_seed_registry() { "so-wazuh:$VERSION" \ "so-zeek:$VERSION" ) - for i in "${TRUSTED_CONTAINERS[@]}" - do - # Pull down the trusted docker image - echo "Downloading $i" - docker pull --disable-content-trust=false docker.io/soshybridhunter/$i - # Tag it with the new registry destination - docker tag soshybridhunter/$i $HOSTNAME:5000/soshybridhunter/$i - docker push $HOSTNAME:5000/soshybridhunter/$i - done + if [ ! -f /nsm/docker-registry/docker/so-dockers-1.1.4.tar ]; then + # Download the container from the interwebs + for i in "${TRUSTED_CONTAINERS[@]}" + do + # Pull down the trusted docker image + echo "Downloading $i" + docker pull --disable-content-trust=false docker.io/soshybridhunter/$i + # Tag it with the new registry destination + docker tag soshybridhunter/$i $HOSTNAME:5000/soshybridhunter/$i + docker push $HOSTNAME:5000/soshybridhunter/$i + done + + for i in "${TRUSTED_CONTAINERS[@]}" + do + echo "Removing $i locally" + docker rmi soshybridhunter/$i + done + else + # We already have the goods son + rm /nsm/docker-registry/docker/so-dockers-$VERSION.tar + fi - for i in "${TRUSTED_CONTAINERS[@]}" - do - echo "Removing $i locally" - docker rmi soshybridhunter/$i - done - } es_heapsize() { From bf6c309f1682863343b28e74fc8af88b3324ce3e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Jan 2020 11:09:55 -0500 Subject: [PATCH 3/3] 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