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

Merge pull request #1182 from Security-Onion-Solutions/feature/airgap

Browse Source 
Feature/airgap
This commit is contained in:
Mike Reeves
2020-08-14 12:32:26 -04:00
committed by GitHub
parent 7686a05f42 c64faacdbc
commit 2a8e4e4eb2
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
setup/so-functions
View File

@@ -942,6 +942,15 @@ install_cleanup() {
} }
import_registry_docker() {
if [ -f /nsm/docker-registry/docker/registry_image.tar ]; then
service docker start
docker import /nsm/docker-registry/docker/registry_image.tar registry:2
else
echo "Need to download registry"
fi
}
manager_pillar() { manager_pillar() {
local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls

2
setup/so-setup
View File

@@ -543,7 +543,7 @@ fi
else else
set_progress_str 26 'Downloading containers from the internet' set_progress_str 26 'Downloading containers from the internet'
fi fi
import_registry_docker >> $setup_log 2>&1
salt-call state.apply -l info registry >> $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 2>> "$setup_log" # ~ 60% when finished