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

dockerfile fices
---

diff --git a/doc/bird.sgml b/doc/bird.sgml
index cb023bbd6..b19bacfdd 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -2758,7 +2758,7 @@ protocol bfd [<name>] {
 	offers better resistance to replay attacks but may require more
 	computation.
 
-	<tag><label id="bfd-password">password "<M>text</M>"</tag>
+	<tag><label id="bfd-password">password "<m>text</m>"</tag>
 	Specifies a password used for authentication. See <ref id="proto-pass"
 	name="password"> common option for detailed description. Note that
 	password option <cf/algorithm/ is not available in BFD protocol. The
diff --git a/misc/docker/centos-7-amd64/Dockerfile b/misc/docker/centos-7-amd64/Dockerfile
index 83a813a5f..0efed4167 100644
--- a/misc/docker/centos-7-amd64/Dockerfile
+++ b/misc/docker/centos-7-amd64/Dockerfile
@@ -6,9 +6,9 @@ RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
 RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
 RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo
 
-# Add new repos for devtoolset-8-gcc. 
+# Add new repos for devtoolset-8-gcc.
 # We need to use devtoolset, because BIRD cannot be correctly compiled with CentOS 7 version of gcc.
-RUN echo -e \ 
+RUN echo -e \
 	"\n[centos-sclo-rh]\nname=CentOS-7.8.2003 - SCLo rh\nbaseurl=https://vault.centos.org/7.8.2003/sclo/\$basearch/rh/\ngpgcheck=0\nenabled=1" \
 	>> /etc/yum.repos.d/CentOS-Base.repo
 RUN echo -e \
@@ -42,5 +42,6 @@ RUN yum -y install \
 	python3-setuptools \
 	devtoolset-8-toolchain
 
+# Backported newer RPM macros, hoping that it stays there for some while until we drop CentOS 7 support
 RUN yum -y install \
 	ftp://ftp.icm.edu.pl/packages/linux-pbone/ftp5.gwdg.de/pub/opensuse/repositories/systemsmanagement:/Ardana:/8:/CentOS/CentOS_7.3/noarch/systemd-rpm-macros-3-5.2.noarch.rpm
diff --git a/misc/docker/opensuse-15.4-amd640/Dockerfile b/misc/docker/opensuse-15.4-amd64/Dockerfile
similarity index 100%
rename from misc/docker/opensuse-15.4-amd640/Dockerfile
rename to misc/docker/opensuse-15.4-amd64/Dockerfile
diff --git a/misc/docker/ubuntu-16.04-amd64/Dockerfile b/misc/docker/ubuntu-16.04-amd64/Dockerfile
index deb1f44a6..fcbac4ac2 100644
--- a/misc/docker/ubuntu-16.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-16.04-amd64/Dockerfile
@@ -1,7 +1,6 @@
 # bump number for image rebuild: 0
 FROM ubuntu:16.04
 ENV DEBIAN_FRONTEND noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
diff --git a/misc/docker/ubuntu-18.04-amd64/Dockerfile b/misc/docker/ubuntu-18.04-amd64/Dockerfile
index 2bcddd4ef..92a804378 100644
--- a/misc/docker/ubuntu-18.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-18.04-amd64/Dockerfile
@@ -1,7 +1,6 @@
 # bump number for image rebuild: 0
 FROM ubuntu:18.04
 ENV DEBIAN_FRONTEND noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
diff --git a/misc/docker/ubuntu-20.04-amd64/Dockerfile b/misc/docker/ubuntu-20.04-amd64/Dockerfile
index da1e6cdfe..13e411c22 100644
--- a/misc/docker/ubuntu-20.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-20.04-amd64/Dockerfile
@@ -1,7 +1,6 @@
 # bump number for image rebuild: 0
 FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
diff --git a/misc/docker/ubuntu-20.10-amd64/Dockerfile b/misc/docker/ubuntu-20.10-amd64/Dockerfile
deleted file mode 100644
index ea0721bc7..000000000
--- a/misc/docker/ubuntu-20.10-amd64/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# bump number for image rebuild: 0
-FROM ubuntu:20.10
-ENV DEBIAN_FRONTEND=noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
-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-21.04-amd64 /Dockerfile b/misc/docker/ubuntu-21.04-amd64 /Dockerfile
deleted file mode 100644
index c904d0eed..000000000
--- a/misc/docker/ubuntu-21.04-amd64 /Dockerfile	
+++ /dev/null
@@ -1,30 +0,0 @@
-# bump number for image rebuild: 1
-FROM ubuntu:21.04
-ENV DEBIAN_FRONTEND=noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
-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-21.10-amd64 /Dockerfile b/misc/docker/ubuntu-21.10-amd64 /Dockerfile
deleted file mode 100644
index 2a4f38610..000000000
--- a/misc/docker/ubuntu-21.10-amd64 /Dockerfile	
+++ /dev/null
@@ -1,30 +0,0 @@
-# bump number for image rebuild: 0
-FROM ubuntu:21.10
-ENV DEBIAN_FRONTEND=noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
-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-22.04-amd64/Dockerfile b/misc/docker/ubuntu-22.04-amd64/Dockerfile
index 67ee6ddc4..03db8c949 100644
--- a/misc/docker/ubuntu-22.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-22.04-amd64/Dockerfile
@@ -1,7 +1,6 @@
 # bump this to refresh the image: 1
 FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
diff --git a/misc/docker/ubuntu-22.10-amd64/Dockerfile b/misc/docker/ubuntu-22.10-amd64/Dockerfile
index f1c4c5a29..1e7180fc3 100644
--- a/misc/docker/ubuntu-22.10-amd64/Dockerfile
+++ b/misc/docker/ubuntu-22.10-amd64/Dockerfile
@@ -1,7 +1,6 @@
 # bump number for image rebuild: 1
 FROM ubuntu:22.10
 ENV DEBIAN_FRONTEND=noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
diff --git a/misc/docker/ubuntu-23.04-amd64 /Dockerfile b/misc/docker/ubuntu-23.04-amd64/Dockerfile
similarity index 88%
rename from misc/docker/ubuntu-23.04-amd64 /Dockerfile
rename to misc/docker/ubuntu-23.04-amd64/Dockerfile
index 8c573eb3d..4c31b13ac 100644
--- a/misc/docker/ubuntu-23.04-amd64 /Dockerfile	
+++ b/misc/docker/ubuntu-23.04-amd64/Dockerfile
@@ -1,7 +1,6 @@
 # bump number for image rebuild: 1
 FROM ubuntu:23.04
 ENV DEBIAN_FRONTEND=noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
diff --git a/misc/docker/ubuntu-23.10-amd64 /Dockerfile b/misc/docker/ubuntu-23.10-amd64/Dockerfile
similarity index 88%
rename from misc/docker/ubuntu-23.10-amd64 /Dockerfile
rename to misc/docker/ubuntu-23.10-amd64/Dockerfile
index dd39e1b5c..0de47684c 100644
--- a/misc/docker/ubuntu-23.10-amd64 /Dockerfile	
+++ b/misc/docker/ubuntu-23.10-amd64/Dockerfile
@@ -1,7 +1,6 @@
 # bump number for image rebuild: 1
 FROM ubuntu:23.10
 ENV DEBIAN_FRONTEND=noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
diff --git a/misc/docker/ubuntu-24.04-amd64  /Dockerfile b/misc/docker/ubuntu-24.04-amd64/Dockerfile
similarity index 88%
rename from misc/docker/ubuntu-24.04-amd64  /Dockerfile
rename to misc/docker/ubuntu-24.04-amd64/Dockerfile
index 6ea1de7eb..c894bb462 100644
--- a/misc/docker/ubuntu-24.04-amd64  /Dockerfile	
+++ b/misc/docker/ubuntu-24.04-amd64/Dockerfile
@@ -1,7 +1,6 @@
 # bump this to refresh the image: 1
 FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND=noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
diff --git a/misc/docker/ubuntu-24.10-amd64  /Dockerfile b/misc/docker/ubuntu-24.10-amd64/Dockerfile
similarity index 88%
rename from misc/docker/ubuntu-24.10-amd64  /Dockerfile
rename to misc/docker/ubuntu-24.10-amd64/Dockerfile
index d804ee798..2a01aa923 100644
--- a/misc/docker/ubuntu-24.10-amd64  /Dockerfile	
+++ b/misc/docker/ubuntu-24.10-amd64/Dockerfile
@@ -1,7 +1,6 @@
 # bump this to refresh the image: 1
 FROM ubuntu:24.10
 ENV DEBIAN_FRONTEND=noninteractive
-RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \