fix: correct install version for ubuntu jammy (#1255)

* fix: correct install version for ubuntu jammy * fix: remove redundant return --------- Co-authored-by: Jason Field <[email protected]> Co-authored-by: Dan Webb <[email protected]>
sous-chefs · Oct 12, 2023 · 3861b7a · 3861b7a
1 parent b019d44
commit 3861b7a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- fix the generation of the docker version string to install on ubuntu jammy
+
 ## 11.2.6 - *2023-10-10*
 
 - Standardise files with files in sous-chefs/repo-management

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ This cookbook is maintained by the Sous Chefs. The Sous Chefs are a community of
 - Amazon Linux 2
 - Debian 9/10/11
 - Fedora
-- Ubuntu 18.04/20.04
+- Ubuntu 18.04/20.04/22.04
 - CentOS 7/8
 
 ## Cookbook Dependencies

diff --git a/resources/installation_package.rb b/resources/installation_package.rb
@@ -89,6 +89,8 @@ def version_string(v)
   if v.to_f < 18.06 && !bionic?
     return "#{v}~ce-0~debian" if debian?
     return "#{v}~ce-0~ubuntu" if ubuntu?
+  elsif v.to_f >= 23.0 && ubuntu?
+    "5:#{v}-1~ubuntu.#{node['platform_version']}~#{codename}"
   elsif v.to_f >= 18.09 && debuntu?
     return "5:#{v}~#{test_version}-0~debian-#{codename}" if debian?
     return "5:#{v}~#{test_version}-0~ubuntu-#{codename}" if ubuntu?