Switch remaining containers over to new registries; Continued bash refactoring

salt/common/tools/sbin/so-image-common

@@ -95,6 +95,7 @@ update_docker_containers() {
   local CURLTYPE=$1
   local IMAGE_TAG_SUFFIX=$2
   local PROGRESS_CALLBACK=$3
+  local LOG_FILE=$4
 
   local CONTAINER_REGISTRY=quay.io
   local SIGNPATH=/root/sosigs
@@ -103,6 +104,10 @@ update_docker_containers() {
     CURLTYPE=unknown
   fi
 
+  if [ -z "$LOG_FILE" ]; then
+    LOG_FILE=/dev/tty
+  fi
+
   # Recheck the version for scenarios were the VERSION wasn't known before this script was imported
   set_version
   set_os
@@ -114,26 +119,26 @@ update_docker_containers() {
   # Let's make sure we have the public key
   curl -sSL https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS | gpg --import -
   
-  rm -rf $SIGNPATH
+  rm -rf $SIGNPATH >> "$LOG_FILE" 2>&1 
-  mkdir -p $SIGNPATH
+  mkdir -p $SIGNPATH >> "$LOG_FILE" 2>&1 
 
   # Download the containers from the interwebs
   for i in "${TRUSTED_CONTAINERS[@]}"
   do
     if [ -z "$PROGRESS_CALLBACK" ]; then
-      echo "Downloading $i"
+      echo "Downloading $i" >> "$LOG_FILE" 2>&1 
     else
       $PROGRESS_CALLBACK $i
     fi
 
     # Pull down the trusted docker image
     local image=$i:$VERSION$IMAGE_TAG_SUFFIX
-    docker pull $CONTAINER_REGISTRY/$IMAGEREPO/$image
+    docker pull $CONTAINER_REGISTRY/$IMAGEREPO/$image >> "$LOG_FILE" 2>&1 
     
     # Get signature
-    curl -A "$CURLTYPE/$CURRENTVERSION/$OS/$(uname -r)" https://sigs.securityonion.net/$VERSION/$i:$VERSION$IMAGE_TAG_SUFFIX.sig --output $SIGNPATH/$image.sig
+    curl -A "$CURLTYPE/$CURRENTVERSION/$OS/$(uname -r)" https://sigs.securityonion.net/$VERSION/$i:$VERSION$IMAGE_TAG_SUFFIX.sig --output $SIGNPATH/$image.sig >> "$LOG_FILE" 2>&1 
     if [[ $? -ne 0 ]]; then
-      echo "Unable to pull signature file for $image"
+      echo "Unable to pull signature file for $image" >> "$LOG_FILE" 2>&1 
       exit 1
     fi
     # Dump our hash values
@@ -143,7 +148,7 @@ update_docker_containers() {
     echo "$DOCKERINSPECT" | jq ".[0].Created, .[0].RootFS.Layers" >> $SIGNPATH/$image.txt
         
     if [[ $? -ne 0 ]]; then
-      echo "Unable to inspect $image"
+      echo "Unable to inspect $image" >> "$LOG_FILE" 2>&1 
       exit 1
     fi
     GPGTEST=$(gpg --verify $SIGNPATH/$image.sig $SIGNPATH/$image.txt 2>&1)
@@ -153,15 +158,14 @@ update_docker_containers() {
         if [ -z "$HOSTNAME" ]; then
           HOSTNAME=$(hostname)
         fi
-        docker tag $CONTAINER_REGISTRY/$IMAGEREPO/$image $HOSTNAME:5000/$IMAGEREPO/$image
+        docker tag $CONTAINER_REGISTRY/$IMAGEREPO/$image $HOSTNAME:5000/$IMAGEREPO/$image >> "$LOG_FILE" 2>&1 
-        docker push $HOSTNAME:5000/$IMAGEREPO/$image
+        docker push $HOSTNAME:5000/$IMAGEREPO/$image >> "$LOG_FILE" 2>&1 
       fi
     else
-      echo "There is a problem downloading the $image image. Details: "
+      echo "There is a problem downloading the $image image. Details: " >> "$LOG_FILE" 2>&1 
-      echo ""
+      echo "" >> "$LOG_FILE" 2>&1 
-      echo $GPGTEST
+      echo $GPGTEST >> "$LOG_FILE" 2>&1 
       exit 1
     fi
   done
-  
 }

salt/domainstats/init.sls

@@ -43,13 +43,13 @@ dstatslogdir:
 
 so-domainstatsimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false docker.io/{{ IMAGEREPO }}/so-domainstats:HH1.0.3
+   - name: docker pull {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-domainstats:{{ VERSION }}
 
 so-domainstats:
   docker_container.running:
     - require:
       - so-domainstatsimage
-    - image: docker.io/{{ IMAGEREPO }}/so-domainstats:HH1.0.3
+    - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-domainstats:{{ VERSION }}
     - hostname: domainstats
     - name: so-domainstats
     - user: domainstats

salt/freqserver/init.sls

@@ -43,13 +43,13 @@ freqlogdir:
 
 so-freqimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false docker.io/{{ IMAGEREPO }}/so-freqserver:HH1.0.3
+   - name: docker pull {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-freqserver:{{ VERSION }}
 
 so-freq:
   docker_container.running:
     - require:
       - so-freqimage
-    - image: docker.io/{{ IMAGEREPO }}/so-freqserver:HH1.0.3
+    - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-freqserver:{{ VERSION }}
     - hostname: freqserver
     - name: so-freqserver
     - user: freqserver

salt/nodered/init.sls

@@ -67,7 +67,7 @@ noderedlog:
 
 so-nodered:
   docker_container.running:
-    - image: {{ IMAGEREPO }}/so-nodered:HH1.2.2
+    - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-nodered:{{ VERSION }}
     - interactive: True
     - binds:
       - /opt/so/conf/nodered/:/data:rw

salt/registry/init.sls

@@ -45,7 +45,7 @@ dockerregistryconf:
 # Install the registry container
 so-dockerregistry:
   docker_container.running:
-    - image: registry:latest
+    - image: ghcr.io/security-onion-solutions/registry:latest
     - hostname: so-registry
     - restart_policy: always
     - port_bindings:

setup/so-functions

@@ -901,10 +901,7 @@ docker_seed_registry() {
 
 		docker_seed_update_percent=25
 
-		# Save output descriptors for use in docker_seed_registry_update function
+		update_docker_containers 'netinstall' '' 'docker_seed_update' "$setup_log"
-		exec 10>&1 20>&2
-
-		update_docker_containers 'netinstall' '' 'docker_seed_update' >> "$setup_log" 2>&1
 	else
 		tar xvf /nsm/docker-registry/docker/registry.tar -C /nsm/docker-registry/docker >> "$setup_log" 2>&1
 		rm /nsm/docker-registry/docker/registry.tar >> "$setup_log" 2>&1

setup/so-setup

@@ -601,7 +601,7 @@ fi
 		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
+		docker_seed_registry # ~ 60% when finished
 		
 		set_progress_str 60 "$(print_salt_state_apply 'manager')"
 		if [[ "$STRELKARULES" == 1 ]]; then