CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-20 16:03:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch remaining containers over to new registries; Continued bash refactoring

Browse Source
This commit is contained in:
Jason Ertel
2020-11-16 15:11:08 -05:00
parent a343e3f31e
commit 8234b6f835
7 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup/so-functions
View File

@@ -901,10 +901,7 @@ docker_seed_registry() {
docker_seed_update_percent=25
# Save output descriptors for use in docker_seed_registry_update function
exec 10>&1 20>&2
update_docker_containers 'netinstall' '' 'docker_seed_update' >> "$setup_log" 2>&1
update_docker_containers 'netinstall' '' 'docker_seed_update' "$setup_log"
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

4
setup/so-setup
View File

@@ -599,9 +599,9 @@ fi
else
set_progress_str 26 'Downloading containers from the internet'
fi
import_registry_docker >> $setup_log 2>&1
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