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

Merge pull request #13620 from Security-Onion-Solutions/jertel/esvs

Browse Source 
es version shift
This commit is contained in:
Jason Ertel
2024-09-05 13:43:44 -04:00
committed by GitHub
parent ad39bc176d 5625771ffb
commit b9d93118b9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
salt/common/tools/sbin/so-image-common
View File

@@ -143,9 +143,12 @@ update_docker_containers() {
$PROGRESS_CALLBACK $i $PROGRESS_CALLBACK $i
fi fi
# use version defined in elasticsearch defaults.yaml if an es container
if [[ " ${IMAGES_USING_ES_VERSION[*]} " =~ [[:space:]]${i}[[:space:]] ]]; then if [[ " ${IMAGES_USING_ES_VERSION[*]} " =~ [[:space:]]${i}[[:space:]] ]]; then
# this is an es container so use version defined in elasticsearch defaults.yaml
local UPDATE_DIR='/tmp/sogh/securityonion' local UPDATE_DIR='/tmp/sogh/securityonion'
if [ ! -d "$UPDATE_DIR" ]; then
UPDATE_DIR=/securityonion
fi
local v1=0 local v1=0
local v2=0 local v2=0
if [[ -f "$UPDATE_DIR/salt/elasticsearch/defaults.yaml" ]]; then if [[ -f "$UPDATE_DIR/salt/elasticsearch/defaults.yaml" ]]; then
@@ -156,8 +159,8 @@ update_docker_containers() {
fi fi
local highest_es_version=$(compare_es_versions "$v1" "$v2") local highest_es_version=$(compare_es_versions "$v1" "$v2")
local image=$i:$highest_es_version$IMAGE_TAG_SUFFIX local image=$i:$highest_es_version$IMAGE_TAG_SUFFIX
# use the so version for the version
else else
# this is not an es container so use the so version for the version
local image=$i:$VERSION$IMAGE_TAG_SUFFIX local image=$i:$VERSION$IMAGE_TAG_SUFFIX
fi fi
# Pull down the trusted docker image # Pull down the trusted docker image