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

Change how version with dashes are handled by so-docker-prune

Browse Source
This commit is contained in:
William Wernert
2021-05-25 11:25:12 -04:00
parent 7e008378ba
commit 192cec1825
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
salt/common/tools/sbin/so-docker-prune
View File

@@ -32,15 +32,15 @@ def get_image_version(string) -> str:
ver = string.split(':')[-1] ver = string.split(':')[-1]
if ver == 'latest': if ver == 'latest':
# Version doesn't like "latest", so use a high semver # Version doesn't like "latest", so use a high semver
return '999999.9.9' return '99999.9.9'
else: else:
try: try:
Version(ver) Version(ver)
except InvalidVersion: except InvalidVersion:
# Also return a very high (but less than 'latest') semver for automated branches # Also return a very high semver for any version
# since the image will most likely be the latest version # with a dash in it since it will likely be a dev version of some kind
if any(substr in ver for substr in ['bravo', 'delta', 'foxtrot', 'kilo']): if '-' in ver:
return '99999.9.9' return '999999.9.9'
return ver return ver