More bash cleanup

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

@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # NOTE: This script depends on so-common
+IMAGEREPO=securityonion
 
 container_list() {
     MANAGERCHECK=so-unknown
@@ -93,7 +94,6 @@ update_docker_containers() {
   IMAGE_TAG_SUFFIX=$2
 
   CONTAINER_REGISTRY=quay.io
-  IMAGEREPO=securityonion
   SIGNPATH=/root/sosigs
   
   if [ -z "$CURLTYPE" ]; then

salt/common/tools/sbin/soup

@@ -431,7 +431,6 @@ echo "Updating dockers to $NEWVERSION."
 if [ $is_airgap -eq 0 ]; then
   airgap_update_dockers
 else
-  container_list
   update_docker_containers "soup"
 fi
 echo ""

setup/so-common-functions

@@ -2,6 +2,7 @@
 
 source ./so-variables
 source ../salt/common/tools/sbin/so-common
+source ../salt/common/tools/sbin/so-image-common
 
 # Helper functions