From adeab10f6d88bdf733e7b7284178eb172fbe95d9 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 10 Jun 2024 12:14:27 -0400 Subject: [PATCH 1/5] upgrade docker and containerd.io for oracle --- salt/docker/init.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 769c58af8..281fbc4ac 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -51,10 +51,10 @@ dockerheldpackages: dockerheldpackages: pkg.installed: - pkgs: - - containerd.io: 1.6.21-3.1.el9 - - docker-ce: 24.0.4-1.el9 - - docker-ce-cli: 24.0.4-1.el9 - - docker-ce-rootless-extras: 24.0.4-1.el9 + - containerd.io: 1.6.33-3.1.el9 + - docker-ce: 26.1.4-1.el9 + - docker-ce-cli: 26.1.4-1.el9 + - docker-ce-rootless-extras: 26.1.4-1.el9 - hold: True - update_holds: True {% endif %} From c6d0a1766937ebc7ae7425e7cba2d23271c93c17 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 10 Jun 2024 15:43:29 -0400 Subject: [PATCH 2/5] docker upgrade debian 12 --- salt/docker/init.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 281fbc4ac..732a9d7dd 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -20,10 +20,10 @@ dockergroup: dockerheldpackages: pkg.installed: - pkgs: - - containerd.io: 1.6.21-1 - - docker-ce: 5:24.0.3-1~debian.12~bookworm - - docker-ce-cli: 5:24.0.3-1~debian.12~bookworm - - docker-ce-rootless-extras: 5:24.0.3-1~debian.12~bookworm + - containerd.io: 1.6.33-1 + - docker-ce: 5:26.1.4-1~debian.12~bookworm + - docker-ce-cli: 5:26.1.4-1~debian.12~bookworm + - docker-ce-rootless-extras: 5:26.1.4-1~debian.12~bookworm - hold: True - update_holds: True {% elif grains.oscodename == 'jammy' %} From dbd987345075eea5a3d28f188eb6543b2d8bc30e Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 10 Jun 2024 16:04:11 -0400 Subject: [PATCH 3/5] upgrade docker for jammy --- salt/docker/init.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 732a9d7dd..9140c1c33 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -30,10 +30,10 @@ dockerheldpackages: 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 + - containerd.io: 1.6.33-1 + - docker-ce: 5:26.1.4-1~ubuntu.22.04~jammy + - docker-ce-cli: 5:26.1.4-1~ubuntu.22.04~jammy + - docker-ce-rootless-extras: 5:26.1.4-1~ubuntu.22.04~jammy - hold: True - update_holds: True {% else %} From 0b1e3b2a7f066b3bfe219ee028acda912422c06c Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 10 Jun 2024 16:24:44 -0400 Subject: [PATCH 4/5] upgrade docker for focal --- salt/docker/init.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 9140c1c33..a02aa4a3b 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -40,10 +40,10 @@ dockerheldpackages: dockerheldpackages: pkg.installed: - pkgs: - - containerd.io: 1.4.9-1 - - docker-ce: 5:20.10.8~3-0~ubuntu-focal - - docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal - - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-focal + - containerd.io: 1.6.33-1 + - docker-ce: 5:26.1.4-1~ubuntu.20.04~focal + - docker-ce-cli: 5:26.1.4-1~ubuntu.20.04~focal + - docker-ce-rootless-extras: 5:26.1.4-1~ubuntu.20.04~focal - hold: True - update_holds: True {% endif %} From 4b481bd405ea088a9d7e6f36d6b512ad2fa4caea Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 11 Jun 2024 09:41:58 -0400 Subject: [PATCH 5/5] add epoch to docker for oracle --- salt/docker/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/docker/init.sls b/salt/docker/init.sls index a02aa4a3b..1e37364bc 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -52,8 +52,8 @@ dockerheldpackages: pkg.installed: - pkgs: - containerd.io: 1.6.33-3.1.el9 - - docker-ce: 26.1.4-1.el9 - - docker-ce-cli: 26.1.4-1.el9 + - docker-ce: 3:26.1.4-1.el9 + - docker-ce-cli: 1:26.1.4-1.el9 - docker-ce-rootless-extras: 26.1.4-1.el9 - hold: True - update_holds: True