From 8e9065885664a7ed0dd7b86efeca3e4b16ada28d Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Jul 2023 10:06:16 -0400 Subject: [PATCH] Add some Ubuntu --- salt/docker/init.sls | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 5fa97c452..f3790cc2e 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -13,6 +13,17 @@ dockergroup: - gid: 920 {% if GLOBALS.os == 'Ubuntu' %} +{% if grains.oscodename == 'jammy' %} +dockerheldpackages: + pkg.installed: + - pkgs: + - containerd.io: 1.6.21-1 + - docker-ce: 5:24.0.2-1~ubuntu.22.04~jammy + - docker-ce-cli: 5:24.0.2-1~ubuntu.22.04~jammy + - docker-ce-rootless-extras: 5:24.0.2-1~ubuntu.22.04~jammy + - hold: True + - update_holds: True +{% else %} dockerheldpackages: pkg.installed: - pkgs: @@ -22,6 +33,7 @@ dockerheldpackages: - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-focal - hold: True - update_holds: True +{% endif %} {% else %} dockerheldpackages: pkg.installed: