Merge pull request #7122 from Security-Onion-Solutions/soup_docker_iso

Soup docker iso

salt/common/tools/sbin/soup

@@ -158,7 +158,7 @@ EOF
 }
 
 airgap_update_dockers() {
-  if [[ $is_airgap -eq 0 ]]; then
+  if [[ $is_airgap -eq 0 ]] || [[ ! -z "$ISOLOC" ]]; then
     # Let's copy the tarball
     if [[ ! -f $AGDOCKER/registry.tar ]]; then
       echo "Unable to locate registry. Exiting"
@@ -976,6 +976,11 @@ main() {
     # Let's mount the ISO since this is airgap
     airgap_mounted
   else
+    # if not airgap but -f was used
+    if [[ ! -z "$ISOLOC" ]]; then
+      airgap_mounted
+      AGDOCKER=/tmp/soagupdate/docker
+    fi
     echo "Cloning Security Onion github repo into $UPDATE_DIR."
     echo "Removing previous upgrade sources."
     rm -rf $UPDATE_DIR
@@ -1031,6 +1036,10 @@ main() {
       update_centos_repo
       yum clean all
       check_os_updates
+    # if not airgap but -f was used
+    elif [[ ! -z "$ISOLOC" ]]; then
+      airgap_update_dockers
+      unmount_update
     else
       update_registry
       set +e