From: Maria Matejka <mq@ucw.cz>
Date: Tue, 1 Apr 2025 09:31:52 +0000 (+0200)
Subject: bye bye eol ubuntus
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8ae4dc98a3420fc2418bae6f2d607d1e4e28788;p=thirdparty%2Fbird.git

bye bye eol ubuntus
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7024ea1cc..b1532be1d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -215,21 +215,6 @@ docker-ubuntu-22_04-amd64:
     IMG_NAME: "ubuntu-22.04-amd64"
   <<: *docker_build
 
-docker-ubuntu-22_10-amd64:
-  variables:
-    IMG_NAME: "ubuntu-22.10-amd64"
-  <<: *docker_build
-
-docker-ubuntu-23_04-amd64:
-  variables:
-    IMG_NAME: "ubuntu-23.04-amd64"
-  <<: *docker_build
-
-docker-ubuntu-23_10-amd64:
-  variables:
-    IMG_NAME: "ubuntu-23.10-amd64"
-  <<: *docker_build
-
 docker-ubuntu-24_04-amd64:
   variables:
     IMG_NAME: "ubuntu-24.04-amd64"
@@ -412,18 +397,6 @@ build-ubuntu-22_04-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64
 
-build-ubuntu-22_10-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:ubuntu-22.10-amd64
-
-build-ubuntu-23_04-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:ubuntu-23.04-amd64
-
-build-ubuntu-23_10-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:ubuntu-23.10-amd64
-
 build-ubuntu-24_04-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64
@@ -721,21 +694,6 @@ pkg-ubuntu-22.04-amd64:
   needs: [build-ubuntu-22_04-amd64]
   image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64
 
-pkg-ubuntu-22.10-amd64:
-  <<: *pkg-deb
-  needs: [build-ubuntu-22_10-amd64]
-  image: registry.nic.cz/labs/bird:ubuntu-22.10-amd64
-
-pkg-ubuntu-23.04-amd64:
-  <<: *pkg-deb
-  needs: [build-ubuntu-23_04-amd64]
-  image: registry.nic.cz/labs/bird:ubuntu-23.04-amd64
-
-pkg-ubuntu-23.10-amd64:
-  <<: *pkg-deb
-  needs: [build-ubuntu-23_10-amd64]
-  image: registry.nic.cz/labs/bird:ubuntu-23.10-amd64
-
 pkg-ubuntu-24.04-amd64:
   <<: *pkg-deb
   needs: [build-ubuntu-24_04-amd64]
diff --git a/misc/docker/ubuntu-22.10-amd64/Dockerfile b/misc/docker/ubuntu-22.10-amd64/Dockerfile
deleted file mode 100644
index 1e7180fc3..000000000
--- a/misc/docker/ubuntu-22.10-amd64/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# bump number for image rebuild: 1
-FROM ubuntu:22.10
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get -y update
-RUN apt-get -y upgrade
-RUN apt-get -y --no-install-recommends install \
-	tzdata \
-	build-essential \
-	flex \
-	bison \
-	autoconf \
-	ncurses-dev \
-	libreadline-dev \
-	libssh-gcrypt-dev \
-	linuxdoc-tools-latex \
-	texlive-latex-extra \
-	opensp \
-	docbook-xsl \
-	xsltproc
-RUN apt-get -y --no-install-recommends install \
-	git \
-	dpkg-dev \
-	debhelper \
-	apt-utils \
-	quilt \
-	python3 \
-	python3-pip \
-	python3-setuptools \
-	python3-venv
diff --git a/misc/docker/ubuntu-23.04-amd64/Dockerfile b/misc/docker/ubuntu-23.04-amd64/Dockerfile
deleted file mode 100644
index 4c31b13ac..000000000
--- a/misc/docker/ubuntu-23.04-amd64/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# bump number for image rebuild: 1
-FROM ubuntu:23.04
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get -y update
-RUN apt-get -y upgrade
-RUN apt-get -y --no-install-recommends install \
-	tzdata \
-	build-essential \
-	flex \
-	bison \
-	autoconf \
-	ncurses-dev \
-	libreadline-dev \
-	libssh-gcrypt-dev \
-	linuxdoc-tools-latex \
-	texlive-latex-extra \
-	opensp \
-	docbook-xsl \
-	xsltproc
-RUN apt-get -y --no-install-recommends install \
-	git \
-	dpkg-dev \
-	debhelper \
-	apt-utils \
-	quilt \
-	python3 \
-	python3-pip \
-	python3-setuptools \
-	python3-venv
diff --git a/misc/docker/ubuntu-23.10-amd64/Dockerfile b/misc/docker/ubuntu-23.10-amd64/Dockerfile
deleted file mode 100644
index 0de47684c..000000000
--- a/misc/docker/ubuntu-23.10-amd64/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# bump number for image rebuild: 1
-FROM ubuntu:23.10
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get -y update
-RUN apt-get -y upgrade
-RUN apt-get -y --no-install-recommends install \
-	tzdata \
-	build-essential \
-	flex \
-	bison \
-	autoconf \
-	ncurses-dev \
-	libreadline-dev \
-	libssh-gcrypt-dev \
-	linuxdoc-tools-latex \
-	texlive-latex-extra \
-	opensp \
-	docbook-xsl \
-	xsltproc
-RUN apt-get -y --no-install-recommends install \
-	git \
-	dpkg-dev \
-	debhelper \
-	apt-utils \
-	quilt \
-	python3 \
-	python3-pip \
-	python3-setuptools \
-	python3-venv