From f8955b98d4765c2c46f38976fbb8a3f94e5634c6 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 9 Jun 2025 22:03:23 +0200 Subject: [PATCH 1/2] distro: remove ubuntu 20.04 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- Makefile | 2 +- common/packages.hcl | 11 ----------- common/packages.mk | 12 +----------- pkg/docker-cli/Dockerfile | 2 +- pkg/docker-engine/Dockerfile | 2 +- 5 files changed, 4 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 0835e2e2..cb2c27b5 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ include common/packages.mk GHA_MATRIX ?= minimal ifeq ($(GHA_MATRIX),minimal) - GHA_RELEASES := debian11 debian12 debian13 ubuntu2004 ubuntu2204 centos9 oraclelinux9 fedora39 static + GHA_RELEASES := debian11 debian12 debian13 ubuntu2204 centos9 oraclelinux9 fedora39 static else ifeq ($(GHA_MATRIX),all) GHA_RELEASES := $(PKG_DEB_RELEASES) $(PKG_RPM_RELEASES) static else diff --git a/common/packages.hcl b/common/packages.hcl index e5b14ca1..be287a5c 100644 --- a/common/packages.hcl +++ b/common/packages.hcl @@ -119,17 +119,6 @@ target "_pkg-raspbian12" { } } -target "_pkg-ubuntu2004" { - args = { - PKG_RELEASE = "ubuntu2004" - PKG_TYPE = "deb" - PKG_DISTRO = "ubuntu" - PKG_DISTRO_ID = "20.04" - PKG_DISTRO_SUITE = "focal" - PKG_BASE_IMAGE = "ubuntu:focal" - } -} - target "_pkg-ubuntu2204" { args = { PKG_RELEASE = "ubuntu2204" diff --git a/common/packages.mk b/common/packages.mk index d7b626dd..b27b7459 100644 --- a/common/packages.mk +++ b/common/packages.mk @@ -15,7 +15,7 @@ # don't forget to add/update pkg-info-* rule and update packages.hcl as well # if you add a new release PKG_APK_RELEASES ?= alpine314 alpine315 alpine316 -PKG_DEB_RELEASES ?= debian11 debian12 debian13 ubuntu2004 ubuntu2204 raspbian11 raspbian12 +PKG_DEB_RELEASES ?= debian11 debian12 debian13 ubuntu2204 raspbian11 raspbian12 PKG_RPM_RELEASES ?= centos9 fedora37 fedora38 fedora39 oraclelinux8 oraclelinux9 # PKG_SUPPORTED_PLATFORMS could be replaced by: @@ -109,16 +109,6 @@ pkg-info-raspbian12: $(eval PKG_BASE_IMAGE = balenalib/rpi-raspbian:bookworm) $(eval PKG_SUPPORTED_PLATFORMS = linux/arm/v7) -.PHONY: pkg-info-ubuntu2004 -pkg-info-ubuntu2004: - $(eval PKG_TYPE = deb) - $(eval PKG_DISTRO = ubuntu) - $(eval PKG_DISTRO_ID = 20.04) - $(eval PKG_DISTRO_SUITE = focal) - $(eval PKG_BASE_IMAGE = ubuntu:focal) - @# FIXME: linux/riscv64 is not supported (golang base image does not support riscv64) - $(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/arm/v7 linux/ppc64le linux/s390x) - .PHONY: pkg-info-ubuntu2204 pkg-info-ubuntu2204: $(eval PKG_TYPE = deb) diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile index a697809e..53be2467 100644 --- a/pkg/docker-cli/Dockerfile +++ b/pkg/docker-cli/Dockerfile @@ -97,7 +97,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils bash RUN < Date: Mon, 9 Jun 2025 22:06:02 +0200 Subject: [PATCH 2/2] distro: add ubuntu 24.04 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- Makefile | 2 +- common/packages.hcl | 11 +++++++++++ common/packages.mk | 11 ++++++++++- pkg/docker-cli/Dockerfile | 2 +- pkg/docker-engine/Dockerfile | 2 +- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cb2c27b5..280ea9d4 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ include common/packages.mk GHA_MATRIX ?= minimal ifeq ($(GHA_MATRIX),minimal) - GHA_RELEASES := debian11 debian12 debian13 ubuntu2204 centos9 oraclelinux9 fedora39 static + GHA_RELEASES := debian11 debian12 debian13 ubuntu2204 ubuntu2404 centos9 oraclelinux9 fedora39 static else ifeq ($(GHA_MATRIX),all) GHA_RELEASES := $(PKG_DEB_RELEASES) $(PKG_RPM_RELEASES) static else diff --git a/common/packages.hcl b/common/packages.hcl index be287a5c..5e0c11ce 100644 --- a/common/packages.hcl +++ b/common/packages.hcl @@ -130,6 +130,17 @@ target "_pkg-ubuntu2204" { } } +target "_pkg-ubuntu2404" { + args = { + PKG_RELEASE = "ubuntu2404" + PKG_TYPE = "deb" + PKG_DISTRO = "ubuntu" + PKG_DISTRO_ID = "24.04" + PKG_DISTRO_SUITE = "noble" + PKG_BASE_IMAGE = "ubuntu:noble" + } +} + target "_pkg-centos9" { args = { PKG_RELEASE = "centos9" diff --git a/common/packages.mk b/common/packages.mk index b27b7459..4e53c31e 100644 --- a/common/packages.mk +++ b/common/packages.mk @@ -15,7 +15,7 @@ # don't forget to add/update pkg-info-* rule and update packages.hcl as well # if you add a new release PKG_APK_RELEASES ?= alpine314 alpine315 alpine316 -PKG_DEB_RELEASES ?= debian11 debian12 debian13 ubuntu2204 raspbian11 raspbian12 +PKG_DEB_RELEASES ?= debian11 debian12 debian13 ubuntu2204 ubuntu2404 raspbian11 raspbian12 PKG_RPM_RELEASES ?= centos9 fedora37 fedora38 fedora39 oraclelinux8 oraclelinux9 # PKG_SUPPORTED_PLATFORMS could be replaced by: @@ -119,6 +119,15 @@ pkg-info-ubuntu2204: @# FIXME: linux/riscv64 is not supported (golang base image does not support riscv64) $(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/arm/v7 linux/ppc64le linux/s390x) +.PHONY: pkg-info-ubuntu2404 +pkg-info-ubuntu2404: + $(eval PKG_TYPE = deb) + $(eval PKG_DISTRO = ubuntu) + $(eval PKG_DISTRO_ID = 24.04) + $(eval PKG_DISTRO_SUITE = noble) + $(eval PKG_BASE_IMAGE = ubuntu:noble) + $(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/arm/v7 linux/ppc64le linux/riscv64 linux/s390x) + .PHONY: pkg-info-centos9 pkg-info-centos9: $(eval PKG_TYPE = rpm) diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile index 53be2467..75ab5423 100644 --- a/pkg/docker-cli/Dockerfile +++ b/pkg/docker-cli/Dockerfile @@ -97,7 +97,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils bash RUN <