Merge pull request #244 from vvoland/ubuntu-oracular-plucky

deb: add Ubuntu 24.10 (Oracular) and 25.04 (Plucky)

Author: crazy-max

docker-bake.hcl

@@ -24,6 +24,8 @@ variable "DISTROS" {
     "raspbian12",
     "ubuntu2204",
     "ubuntu2404",
+    "ubuntu2410",
+    "ubuntu2504",
 
     "almalinux8",
     "almalinux9",
@@ -253,6 +255,28 @@ target "_distro-ubuntu2404" {
   }
 }
 
+target "_distro-ubuntu2410" {
+  args = {
+    DISTRO_NAME = "ubuntu2410"
+    DISTRO_TYPE = "deb"
+    DISTRO_RELEASE = "ubuntu"
+    DISTRO_ID = "24.10"
+    DISTRO_SUITE = "oracular"
+    DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "ubuntu:oracular"
+  }
+}
+
+target "_distro-ubuntu2504" {
+  args = {
+    DISTRO_NAME = "ubuntu2504"
+    DISTRO_TYPE = "deb"
+    DISTRO_RELEASE = "ubuntu"
+    DISTRO_ID = "25.04"
+    DISTRO_SUITE = "plucky"
+    DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "ubuntu:plucky"
+  }
+}
+
 target "_distro-almalinux8" {
   args = {
     DISTRO_NAME = "almalinux8"
@@ -404,6 +428,8 @@ function "distroPlatforms" {
         raspbian12 = ["linux/arm/v7"]
         ubuntu2204 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/s390x"]
         ubuntu2404 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/riscv64", "linux/s390x"]
+        ubuntu2410 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/riscv64", "linux/s390x"]
+        ubuntu2504 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/riscv64", "linux/s390x"]
 
         almalinux8 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         almalinux9 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]

pkg/docker-cli/Dockerfile

@@ -101,7 +101,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils bash
 RUN <<EOT
   set -e
   case "$DISTRO_NAME" in
-    ubuntu2204|ubuntu2404)
+    ubuntu*)
       if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then
         rm -f /usr/bin/man
         dpkg-divert --quiet --remove --rename /usr/bin/man

pkg/docker-engine/Dockerfile

@@ -99,7 +99,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils bash
 RUN <<EOT
   set -e
   case "$DISTRO_NAME" in
-    ubuntu2204|ubuntu2404)
+    ubuntu*)
       if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then
         rm -f /usr/bin/man
         dpkg-divert --quiet --remove --rename /usr/bin/man