From: Jana Babovakova Date: Fri, 28 Mar 2025 13:18:06 +0000 (+0100) Subject: Merge branch 'jb_distribution_list' into centos7-pckg X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74b6302a8bd25f8329f7c8368ac36e6003719e30;p=thirdparty%2Fbird.git Merge branch 'jb_distribution_list' into centos7-pckg --- 74b6302a8bd25f8329f7c8368ac36e6003719e30 diff --cc .gitlab-ci.yml index dc18e5931,2f9b4e964..ac3ede047 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@@ -297,41 -104,42 +289,74 @@@ build-fedora-34-amd64 <<: *build-linux image: registry.nic.cz/labs/bird:fedora-34-amd64 + build-fedora-35-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-35-amd64 + + build-fedora-36-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-36-amd64 + + build-fedora-37-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-37-amd64 + + build-fedora-38-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-38-amd64 + + build-fedora-39-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-39-amd64 + + build-fedora-40-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-40-amd64 + + build-fedora-41-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-41-amd64 + + #installation not available yet + # build-fedora-42-amd64: + # <<: *build-linux + # image: registry.nic.cz/labs/bird:fedora-42-amd64 + -#build-centos-7-amd64: -# <<: *build-linux -# image: registry.nic.cz/labs/bird:centos-7-amd64 +build-fedora-35-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-35-amd64 + +build-fedora-36-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-36-amd64 + +build-fedora-37-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-37-amd64 + +build-fedora-38-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-38-amd64 + +build-fedora-39-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-39-amd64 + +build-fedora-40-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-40-amd64 + +build-fedora-41-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-41-amd64 + +build-centos-7-amd64: + <<: *build-linux + variables: + # export path to devtoolset-8-gcc + CC: /opt/rh/devtoolset-8/root/usr/bin/gcc + LC_ALL: en_US.UTF-8 + image: registry.nic.cz/labs/bird:centos-7-amd64 build-centos-8-amd64: <<: *build-linux @@@ -349,6 -157,19 +374,19 @@@ build-ubuntu-20_04-amd64 <<: *build-linux image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64 + build-ubuntu-20_10-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:ubuntu-20.10-amd64 + + #installation not available + # build-ubuntu-21_04-amd64: + # <<: *build-linux + # image: registry.nic.cz/labs/bird:ubuntu-21.04-amd64 + + build-ubuntu-21_10-amd64: + <<: *build-linux - image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64 ++ image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64 + build-ubuntu-22_04-amd64: <<: *build-linux image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64 @@@ -555,12 -397,12 +632,14 @@@ pkg-fedora-34-amd64 image: registry.nic.cz/labs/bird:fedora-34-amd64 pkg-fedora-35-amd64: - <<: *pkg-rpm-wa + <<: *pkg-rpm ++ #<<: *pkg-rpm-wa needs: [build-fedora-35-amd64] image: registry.nic.cz/labs/bird:fedora-35-amd64 pkg-fedora-36-amd64: - <<: *pkg-rpm-wa + <<: *pkg-rpm ++ #<<: *pkg-rpm-wa needs: [build-fedora-36-amd64] image: registry.nic.cz/labs/bird:fedora-36-amd64 @@@ -570,12 -412,12 +649,14 @@@ pkg-fedora-37-amd64 image: registry.nic.cz/labs/bird:fedora-37-amd64 pkg-fedora-38-amd64: - <<: *pkg-rpm-wa + <<: *pkg-rpm ++ #<<: *pkg-rpm-wa needs: [build-fedora-38-amd64] image: registry.nic.cz/labs/bird:fedora-38-amd64 pkg-fedora-39-amd64: - <<: *pkg-rpm-wa + <<: *pkg-rpm ++ #<<: *pkg-rpm-wa needs: [build-fedora-39-amd64] image: registry.nic.cz/labs/bird:fedora-39-amd64 @@@ -589,14 -431,18 +670,20 @@@ pkg-fedora-41-amd64 needs: [build-fedora-41-amd64] image: registry.nic.cz/labs/bird:fedora-41-amd64 + #installation not available yet + # pkg-fedora-42-amd64: + # <<: *pkg-rpm + # needs: [build-fedora-42-amd64] + # image: registry.nic.cz/labs/bird:fedora-42-amd64 + -#pkg-centos-7-amd64: -# <<: *pkg-rpm-wa -# variables: -# LC_ALL: en_US.UTF-8 -# needs: [build-centos-7-amd64] -# image: registry.nic.cz/labs/bird:centos-7-amd64 +pkg-centos-7-amd64: + <<: *pkg-rpm-wa + variables: + # export path to devtoolset-8-gcc + CC: /opt/rh/devtoolset-8/root/usr/bin/gcc + LC_ALL: en_US.UTF-8 + needs: [build-centos-7-amd64] + image: registry.nic.cz/labs/bird:centos-7-amd64 # Removed due to apkg breakage #pkg-centos-8-amd64: @@@ -615,20 -467,56 +708,56 @@@ pkg-ubuntu-20.04-amd64 needs: [build-ubuntu-20_04-amd64] image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64 - pkg-ubuntu-22.04-amd64: + pkg-ubuntu-20.10-amd64: + <<: *pkg-deb + needs: [build-ubuntu-20_10-amd64] + image: registry.nic.cz/labs/bird:ubuntu-20.10-amd64 + + #Installation not available + # pkg-ubuntu-21.04-amd64: + # <<: *pkg-deb + # needs: [build-ubuntu-21_04-amd64] + # image: registry.nic.cz/labs/bird:ubuntu-21.04-amd64 + + pkg-ubuntu-21.10-amd64: <<: *pkg-deb - needs: [build-ubuntu-21_10-amd64] - image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64 + needs: [build-ubuntu-22_04-amd64] + image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64 - pkg-ubuntu-24.04-amd64: + pkg-ubuntu-22.04-amd64: <<: *pkg-deb - needs: [build-ubuntu-24_04-amd64] - image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64 + needs: [build-ubuntu-22_04-amd64] + image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64 - pkg-ubuntu-24.10-amd64: - <<: *pkg-deb - needs: [build-ubuntu-24_10-amd64] - image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64 + #Installation not available + # pkg-ubuntu-22.10-amd64: + # <<: *pkg-deb + # needs: [build-ubuntu-22_10-amd64] + # image: registry.nic.cz/labs/bird:ubuntu-22.10-amd64 + + #Installation not available + # pkg-ubuntu-23.04-amd64: + # <<: *pkg-deb + # needs: [build-ubuntu-23_04-amd64] + # image: registry.nic.cz/labs/bird:ubuntu-23.04-amd64 + + #Installation not available + # pkg-ubuntu-23.10-amd64: + # <<: *pkg-deb + # needs: [build-ubuntu-23_10-amd64] + # image: registry.nic.cz/labs/bird:ubuntu-23.10-amd64 + + # Removed due to apkg breakage + # pkg-ubuntu-24.04-amd64: + # <<: *pkg-deb + # needs: [build-ubuntu-24_04-amd64] + # image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64 + + # Removed due to apkg breakage + # pkg-ubuntu-24.10-amd64: + # <<: *pkg-deb + # needs: [build-ubuntu-24_10-amd64] + # image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64 # Removed due to apkg breakage #pkg-opensuse-15.1-amd64: diff --cc misc/docker/debian-12-amd64/Dockerfile index 9a3ab9f43,8679f3fa2..d5c2b1711 --- a/misc/docker/debian-12-amd64/Dockerfile +++ b/misc/docker/debian-12-amd64/Dockerfile @@@ -1,6 -1,6 +1,7 @@@ +# bump number for image rebuild: 2 FROM amd64/debian:bookworm-slim 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 --cc misc/docker/debian-12-i386/Dockerfile index a324f9efa,0e0b21ea7..a2f5af4d3 --- a/misc/docker/debian-12-i386/Dockerfile +++ b/misc/docker/debian-12-i386/Dockerfile @@@ -1,6 -1,6 +1,7 @@@ +# bump number for image rebuild: 1 FROM i386/debian:bookworm-slim ENV DEBIAN_FRONTEND=noninteractive + RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list RUN apt-get -y update && apt-get -y upgrade RUN apt-get -y --no-install-recommends install \ build-essential \ diff --cc misc/docker/fedora-35-amd64/Dockerfile index dee5d2469,5bfa6202f..fe57f9747 --- a/misc/docker/fedora-35-amd64/Dockerfile +++ b/misc/docker/fedora-35-amd64/Dockerfile @@@ -1,18 -1,11 +1,22 @@@ FROM fedora:35 RUN dnf -y upgrade ++#RUN dnf -y update RUN dnf -y install \ + gcc \ make \ - autoconf \ flex \ bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc + autoconf \ ++ # pkgconfig \ ++ # 'readline-devel' \ ++ # 'pkgconfig(ncurses)' \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN dnf -y install \ + git \ + rpm-build \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --cc misc/docker/fedora-36-amd64/Dockerfile index cb84e3c73,fae222bd3..9f5296c3e --- a/misc/docker/fedora-36-amd64/Dockerfile +++ b/misc/docker/fedora-36-amd64/Dockerfile @@@ -1,18 -1,11 +1,21 @@@ FROM fedora:36 RUN dnf -y upgrade RUN dnf -y install \ + gcc \ make \ - autoconf \ flex \ bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc + autoconf \ ++ # pkgconfig \ ++ # 'readline-devel' \ ++ # 'pkgconfig(ncurses)' \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN dnf -y install \ + git \ + rpm-build \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --cc misc/docker/fedora-37-amd64/Dockerfile index e6cbd7f5b,261a5e0f9..f7317875d --- a/misc/docker/fedora-37-amd64/Dockerfile +++ b/misc/docker/fedora-37-amd64/Dockerfile @@@ -1,18 -1,11 +1,21 @@@ FROM fedora:37 RUN dnf -y upgrade RUN dnf -y install \ + gcc \ make \ - autoconf \ flex \ bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc + autoconf \ ++ # pkgconfig \ ++ # 'readline-devel' \ ++ # 'pkgconfig(ncurses)' \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN dnf -y install \ + git \ + rpm-build \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --cc misc/docker/fedora-38-amd64/Dockerfile index 5f889b848,b01777023..877f6496e --- a/misc/docker/fedora-38-amd64/Dockerfile +++ b/misc/docker/fedora-38-amd64/Dockerfile @@@ -1,18 -1,11 +1,21 @@@ FROM fedora:38 RUN dnf -y upgrade RUN dnf -y install \ + gcc \ make \ - autoconf \ flex \ bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc + autoconf \ ++ # pkgconfig \ ++ # 'readline-devel' \ ++ # 'pkgconfig(ncurses)' \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN dnf -y install \ + git \ + rpm-build \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --cc misc/docker/fedora-39-amd64/Dockerfile index 1e0c812ec,d4e6ea0a4..be5faa82f --- a/misc/docker/fedora-39-amd64/Dockerfile +++ b/misc/docker/fedora-39-amd64/Dockerfile @@@ -1,18 -1,11 +1,21 @@@ FROM fedora:39 RUN dnf -y upgrade RUN dnf -y install \ + gcc \ make \ - autoconf \ flex \ bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc ++ # pkgconfig \ ++ # 'readline-devel' \ ++ # 'pkgconfig(ncurses)' \ + autoconf \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN dnf -y install \ + git \ + rpm-build \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --cc misc/docker/fedora-40-amd64/Dockerfile index 786385fea,f3f973728..a8f6952fc --- a/misc/docker/fedora-40-amd64/Dockerfile +++ b/misc/docker/fedora-40-amd64/Dockerfile @@@ -1,5 -1,5 +1,6 @@@ FROM fedora:40 -RUN dnf -y update +RUN dnf -y upgrade ++#RUN dnf -y update RUN dnf -y install \ gcc \ make \ diff --cc misc/docker/ubuntu-20.10-amd64/Dockerfile index 000000000,19cb1b858..cb377ddda mode 000000,100644..100644 --- a/misc/docker/ubuntu-20.10-amd64/Dockerfile +++ b/misc/docker/ubuntu-20.10-amd64/Dockerfile @@@ -1,0 -1,27 +1,25 @@@ + 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 install \ + 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 install \ + git \ + dpkg-dev \ + debhelper \ + apt-utils \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools diff --cc misc/docker/ubuntu-22.04-amd64/Dockerfile index 4996fff2a,e3cdc7f38..57806ca8a --- a/misc/docker/ubuntu-22.04-amd64/Dockerfile +++ b/misc/docker/ubuntu-22.04-amd64/Dockerfile @@@ -1,9 -1,10 +1,10 @@@ +# 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 \ +RUN apt-get -y install \ ++#RUN apt-get -y --no-install-recommends install \ + tzdata \ build-essential \ flex \ bison \ diff --cc misc/docker/ubuntu-22.10-amd64/Dockerfile index 000000000,f796df8ac..76a9e526a mode 000000,100644..100644 --- a/misc/docker/ubuntu-22.10-amd64/Dockerfile +++ b/misc/docker/ubuntu-22.10-amd64/Dockerfile @@@ -1,0 -1,28 +1,26 @@@ + 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 \ + 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 install \ + git \ + dpkg-dev \ + debhelper \ + apt-utils \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools diff --cc misc/docker/ubuntu-23.04-amd64 /Dockerfile index 000000000,f5a627973..9928a6a5d mode 000000,100644..100644 --- a/misc/docker/ubuntu-23.04-amd64 /Dockerfile +++ b/misc/docker/ubuntu-23.04-amd64 /Dockerfile @@@ -1,0 -1,28 +1,26 @@@ + 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 \ + 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 install \ + git \ + dpkg-dev \ + debhelper \ + apt-utils \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools diff --cc misc/docker/ubuntu-23.10-amd64 /Dockerfile index 000000000,798bd401f..7ddb1a8eb mode 000000,100644..100644 --- a/misc/docker/ubuntu-23.10-amd64 /Dockerfile +++ b/misc/docker/ubuntu-23.10-amd64 /Dockerfile @@@ -1,0 -1,28 +1,26 @@@ + 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 \ + 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 install \ + git \ + dpkg-dev \ + debhelper \ + apt-utils \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools diff --cc misc/docker/ubuntu-24.04-amd64 /Dockerfile index 000000000,521a4c624..1cd969f44 mode 000000,100644..100644 --- a/misc/docker/ubuntu-24.04-amd64 /Dockerfile +++ b/misc/docker/ubuntu-24.04-amd64 /Dockerfile @@@ -1,0 -1,28 +1,26 @@@ + 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 \ + 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 install \ + git \ + dpkg-dev \ + debhelper \ + apt-utils \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools diff --cc misc/docker/ubuntu-24.10-amd64 /Dockerfile index 000000000,eac14f5f9..5a4cdef6e mode 000000,100644..100644 --- a/misc/docker/ubuntu-24.10-amd64 /Dockerfile +++ b/misc/docker/ubuntu-24.10-amd64 /Dockerfile @@@ -1,0 -1,28 +1,26 @@@ + 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 \ + 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 install \ + git \ + dpkg-dev \ + debhelper \ + apt-utils \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools