dockerfile fices

diff --git a/doc/bird.sgml b/doc/bird.sgml
index cb023bbd62c1c67932d89b0da30dde6bf8045d2c..b19bacfddefd9416d9a018cfe9a438617d5f5efb 100644 (file)
--- 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 83a813a5f0ee8b362dad0755147e3965f7f1c35b..0efed416705282e80236a194eae61343dcdd2187 100644 (file)
--- 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 deb1f44a62a8f2a11a11feb96d225c1c08964919..fcbac4ac25a863d8cfb856ffb8050debeda39d7f 100644 (file)
--- 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 2bcddd4efafa748dd58de2346f89a62973d48fc3..92a804378c5f4b930f497d666b21487860eec08f 100644 (file)
--- 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 da1e6cdfedf830913092793c8b6552a7ec439415..13e411c225822303b2a19ca0c9dfb5da59d3cfe1 100644 (file)
--- 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 (file)
index ea0721b..0000000
--- 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 (file)
index c904d0e..0000000
--- 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 (file)
index 2a4f386..0000000
--- 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 67ee6ddc44ba3c9c5e25021dd997118e039ee290..03db8c9499790937fa68d7c14d892ae55f597b3d 100644 (file)
--- 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 f1c4c5a299065a124705f257c7e0a22d75fbad73..1e7180fc3acee070ce1e83348afa8f1a0164514c 100644 (file)
--- 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 8c573eb3d296ccc0b5c7ae3902bd3ff7685a0eb9..4c31b13acb3ffaae144766191b41c1768d6d68d6 100644 (file)
--- 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 dd39e1b5c36e60ff01ff0c7c26c9c6c474ee530d..0de47684c771e2cc7146ebab9e9367d41ddc34d6 100644 (file)
--- 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 6ea1de7ebc78f8f600aff418b7d269fdc154774d..c894bb4622411872eda6e5d1ba8632ef4775198b 100644 (file)
--- 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 d804ee79893cddc46cfb98a93ddbb1bf67356f8c..2a01aa9233f8aeb21f466aa96b0ad90adff7dee2 100644 (file)
--- 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 \