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 #13182 from Security-Onion-Solutions/dockerup

Browse Source 
upgrade docker
This commit is contained in:
Josh Patterson
2024-06-11 11:08:40 -04:00
committed by GitHub
parent 7ad6baf483 4b481bd405
commit 03335cc015
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
salt/docker/init.sls
View File

@@ -20,30 +20,30 @@ dockergroup:
dockerheldpackages: dockerheldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.6.21-1 - containerd.io: 1.6.33-1
- docker-ce: 5:24.0.3-1~debian.12~bookworm - docker-ce: 5:26.1.4-1~debian.12~bookworm
- docker-ce-cli: 5:24.0.3-1~debian.12~bookworm - docker-ce-cli: 5:26.1.4-1~debian.12~bookworm
- docker-ce-rootless-extras: 5:24.0.3-1~debian.12~bookworm - docker-ce-rootless-extras: 5:26.1.4-1~debian.12~bookworm
- hold: True - hold: True
- update_holds: True - update_holds: True
{% elif grains.oscodename == 'jammy' %} {% elif grains.oscodename == 'jammy' %}
dockerheldpackages: dockerheldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.6.21-1 - containerd.io: 1.6.33-1
- docker-ce: 5:24.0.2-1~ubuntu.22.04~jammy - docker-ce: 5:26.1.4-1~ubuntu.22.04~jammy
- docker-ce-cli: 5:24.0.2-1~ubuntu.22.04~jammy - docker-ce-cli: 5:26.1.4-1~ubuntu.22.04~jammy
- docker-ce-rootless-extras: 5:24.0.2-1~ubuntu.22.04~jammy - docker-ce-rootless-extras: 5:26.1.4-1~ubuntu.22.04~jammy
- hold: True - hold: True
- update_holds: True - update_holds: True
{% else %} {% else %}
dockerheldpackages: dockerheldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.4.9-1 - containerd.io: 1.6.33-1
- docker-ce: 5:20.10.8~3-0~ubuntu-focal - docker-ce: 5:26.1.4-1~ubuntu.20.04~focal
- docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal - docker-ce-cli: 5:26.1.4-1~ubuntu.20.04~focal
- docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-focal - docker-ce-rootless-extras: 5:26.1.4-1~ubuntu.20.04~focal
- hold: True - hold: True
- update_holds: True - update_holds: True
{% endif %} {% endif %}
@@ -51,10 +51,10 @@ dockerheldpackages:
dockerheldpackages: dockerheldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.6.21-3.1.el9 - containerd.io: 1.6.33-3.1.el9
- docker-ce: 24.0.4-1.el9 - docker-ce: 3:26.1.4-1.el9
- docker-ce-cli: 24.0.4-1.el9 - docker-ce-cli: 1:26.1.4-1.el9
- docker-ce-rootless-extras: 24.0.4-1.el9 - docker-ce-rootless-extras: 26.1.4-1.el9
- hold: True - hold: True
- update_holds: True - update_holds: True
{% endif %} {% endif %}