Merge pull request #136 from crazy-max/ubuntu-2210-eol

common: ubuntu 22.10 eol
docker · Aug 5, 2023 · 2396a0b · 2396a0b
2 parents 9a0b91b + 5ab0338
commit 2396a0b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 24 deletions.
diff --git a/common/packages.hcl b/common/packages.hcl
@@ -152,17 +152,6 @@ target "_pkg-ubuntu2204" {
   }
 }
 
-target "_pkg-ubuntu2210" {
-  args = {
-    PKG_RELEASE = "ubuntu2210"
-    PKG_TYPE = "deb"
-    PKG_DISTRO = "ubuntu"
-    PKG_DISTRO_ID = "22.10"
-    PKG_DISTRO_SUITE = "kinetic"
-    PKG_BASE_IMAGE = "ubuntu:kinetic"
-  }
-}
-
 target "_pkg-ubuntu2304" {
   args = {
     PKG_RELEASE = "ubuntu2304"

diff --git 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 ?= debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2210 ubuntu2304 raspbian10 raspbian11 raspbian12
+PKG_DEB_RELEASES ?= debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2304 raspbian10 raspbian11 raspbian12
 PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora36 fedora37 fedora38 oraclelinux7 oraclelinux8 oraclelinux9
 
 # PKG_SUPPORTED_PLATFORMS could be replaced by:
@@ -138,16 +138,6 @@ 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-ubuntu2210
-pkg-info-ubuntu2210:
-	$(eval PKG_TYPE = deb)
-	$(eval PKG_DISTRO = ubuntu)
-	$(eval PKG_DISTRO_ID = 22.10)
-	$(eval PKG_DISTRO_SUITE = kinetic)
-	$(eval PKG_BASE_IMAGE = ubuntu:kinetic)
-	@# 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-ubuntu2304
 pkg-info-ubuntu2304:
 	$(eval PKG_TYPE = deb)

diff --git a/pkg/docker-cli/Dockerfile b/pkg/docker-cli/Dockerfile
@@ -96,7 +96,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils bash
 RUN <<EOT
   set -e
   case "$PKG_RELEASE" in
-    ubuntu2004|ubuntu2204|ubuntu2210|ubuntu2304)
+    ubuntu2004|ubuntu2204|ubuntu2304)
       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

diff --git a/pkg/docker-engine/Dockerfile b/pkg/docker-engine/Dockerfile
@@ -95,7 +95,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils bash
 RUN <<EOT
   set -e
   case "$PKG_RELEASE" in
-    ubuntu2004|ubuntu2204|ubuntu2210|ubuntu2304)
+    ubuntu2004|ubuntu2204|ubuntu2304)
       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