common: ubuntu 18.04 eol

Signed-off-by: CrazyMax <[email protected]>
docker · Aug 4, 2023 · 9ff5237 · 9ff5237
1 parent 063cfd1
commit 9ff5237
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ include common/packages.mk
 
 GHA_MATRIX ?= minimal
 ifeq ($(GHA_MATRIX),minimal)
-	GHA_RELEASES := debian10 debian11 debian12 ubuntu1804 ubuntu2004 ubuntu2204 ubuntu2304 centos7 centos9 oraclelinux7 fedora37 fedora38 static
+	GHA_RELEASES := debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2304 centos7 centos9 oraclelinux7 fedora37 fedora38 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
@@ -130,17 +130,6 @@ target "_pkg-raspbian12" {
   }
 }
 
-target "_pkg-ubuntu1804" {
-  args = {
-    PKG_RELEASE = "ubuntu1804"
-    PKG_TYPE = "deb"
-    PKG_DISTRO = "ubuntu"
-    PKG_DISTRO_ID = "18.04"
-    PKG_DISTRO_SUITE = "bionic"
-    PKG_BASE_IMAGE = "ubuntu:bionic"
-  }
-}
-
 target "_pkg-ubuntu2004" {
   args = {
     PKG_RELEASE = "ubuntu2004"

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 ubuntu1804 ubuntu2004 ubuntu2204 ubuntu2210 ubuntu2304 raspbian10 raspbian11 raspbian12
+PKG_DEB_RELEASES ?= debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2210 ubuntu2304 raspbian10 raspbian11 raspbian12
 PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora36 fedora37 fedora38 oraclelinux7 oraclelinux8 oraclelinux9
 
 # PKG_SUPPORTED_PLATFORMS could be replaced by:
@@ -118,15 +118,6 @@ pkg-info-raspbian12:
 	$(eval PKG_BASE_IMAGE = balenalib/rpi-raspbian:bookworm)
 	$(eval PKG_SUPPORTED_PLATFORMS = linux/arm/v7)
 
-.PHONY: pkg-info-ubuntu1804
-pkg-info-ubuntu1804:
-	$(eval PKG_TYPE = deb)
-	$(eval PKG_DISTRO = ubuntu)
-	$(eval PKG_DISTRO_ID = 18.04)
-	$(eval PKG_DISTRO_SUITE = bionic)
-	$(eval PKG_BASE_IMAGE = ubuntu:bionic)
-	$(eval PKG_SUPPORTED_PLATFORMS = linux/386 linux/amd64 linux/arm64 linux/arm/v7 linux/ppc64le linux/s390x)
-
 .PHONY: pkg-info-ubuntu2004
 pkg-info-ubuntu2004:
 	$(eval PKG_TYPE = deb)