Skip to content

Commit

Permalink
Merge pull request #108 from kraken-build/nr/update-to-ubuntu-24
Browse files Browse the repository at this point in the history
Remove Ubuntu 20.04 and change default from 22.04 to 24.04
  • Loading branch information
NiklasRosenstein authored Jan 5, 2025
2 parents d72e885 + 6310a90 commit cfa6b57
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ jobs:
matrix:
include:
- arch: amd64
base_image: ubuntu_20.04
base_image: ubuntu_24.04
runs_on: ubuntu-latest
- arch: amd64
base_image: ubuntu_22.04
runs_on: ubuntu-latest
- arch: arm64
base_image: ubuntu_20.04
base_image: ubuntu_24.04
runs_on: [buildjet-4vcpu-ubuntu-2204-arm]
- arch: arm64
base_image: ubuntu_22.04
Expand Down
2 changes: 1 addition & 1 deletion .kraken.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
image_prefix = "ghcr.io/kraken-build/kraken-base-image"

base_image = "ubuntu"
image_versions = ["20.04", "22.04"]
image_versions = ["22.04", "24.04"]
latest_version = image_versions[-1]

default_base_image = f"{base_image}:{latest_version}"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ is built from various Ubuntu starting images. We use semantic versioning in the

| Starting Image | Kraken base image tags | Notes |
|----------------|---------------------------------------------------------------------------------------------|-------|
| `ubuntu:20.04` | `develop-ubuntu_20.04`, `x.y.z-ubuntu_20.04`, `x.y-ubuntu_20.04` | |
| `ubuntu:22.04` | `develop`, `x.y.z`, `x.y`, `develop-ubuntu_22.04`, `x.y.z-ubuntu_22.04`, `x.y-ubuntu_22.04` | |
| `ubuntu:22.04` | `develop-ubuntu_22.04`, `x.y.z-ubuntu_22.04`, `x.y-ubuntu_22.04` | |
| `ubuntu:24.04` | `develop`, `x.y.z`, `x.y`, `develop-ubuntu_24.04`, `x.y.z-ubuntu_24.04`, `x.y-ubuntu_24.04` | |

### Versioning rules

Expand Down

0 comments on commit cfa6b57

Please sign in to comment.