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

prevent dockers from redownloading if we are updating soup to a branch

Browse Source
This commit is contained in:
m0duspwnens
2020-07-27 18:19:26 -04:00
parent f42a39ca69
commit 254dcdb2f0
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/salt/master.sls
View File

@@ -1,4 +1,4 @@
#version cannot be used elsewhere in this pillar as soup is grepping for it to determine if Salt needs to be patched #version cannot be used elsewhere in this pillar as soup is grepping for it to determine if Salt needs to be patched
salt: salt:
master: master:
version: 3001.1 version: 3001

2
pillar/salt/minion.sls
View File

@@ -1,4 +1,4 @@
#version cannot be used elsewhere in this pillar as soup is grepping for it to determine if Salt needs to be patched #version cannot be used elsewhere in this pillar as soup is grepping for it to determine if Salt needs to be patched
salt: salt:
minion: minion:
version: 3001.1 version: 3001

14
salt/common/tools/sbin/soup
View File

@@ -225,11 +225,15 @@ upgrade_check_salt
echo "Making pillar changes" echo "Making pillar changes"
pillar_changes pillar_changes
echo "" echo ""
echo "Cleaning up old dockers"
clean_dockers if [ "$INSTALLEDVERSION" != "$NEWVERSION" ]; then
echo "" echo "Cleaning up old dockers"
echo "Updating docker to $NEWVERSION" clean_dockers
update_dockers echo ""
echo "Updating docker to $NEWVERSION"
update_dockers
fi
echo "" echo ""
echo "Copying new code" echo "Copying new code"
copy_new_files copy_new_files