Skip to content

Commit

Permalink
docker_installation_package: support for ubuntu 24.04 (#1274)
Browse files Browse the repository at this point in the history
* docker_installation_package: support for ubuntu 24.04

* Update ci.yml

* typo

* Update CHANGELOG.md
  • Loading branch information
san983 authored Jul 15, 2024
1 parent cdbfad1 commit be8e682
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
- "rockylinux-9"
- "ubuntu-2004"
- "ubuntu-2204"
- "ubuntu-2404"
suite:
- "installation-script-main"
- "installation-script-test"
Expand Down Expand Up @@ -111,6 +112,8 @@ jobs:
- "rockylinux-8"
- "ubuntu-1804"
- "ubuntu-2004"
- "ubuntu-2204"
- "ubuntu-2404"
suite:
- "smoke"
fail-fast: false
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

- `docker_installation_package` support for Ubuntu v24.04 (noble)

## 11.3.7 - *2024-07-09*

- Bump `docker-api` dependency to `>= 2.3` to fix [upstream bug #586](https://github.com/upserve/docker-api/issues/586)
Expand Down
7 changes: 7 additions & 0 deletions resources/installation_package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ def jammy?
false
end

def noble?
return true if platform?('ubuntu') && node['platform_version'] == '24.04'
false
end

# https://github.com/chef/chef/issues/4103
def version_string(v)
return if v.nil?
Expand All @@ -89,6 +94,8 @@ def version_string(v)
'focal'
elsif jammy? # ubuntu 22.04
'jammy'
elsif noble? # ubuntu 24.04
'noble'
end

# https://github.com/seemethere/docker-ce-packaging/blob/9ba8e36e8588ea75209d813558c8065844c953a0/deb/gen-deb-ver#L16-L20
Expand Down

0 comments on commit be8e682

Please sign in to comment.