diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7313605f297d5f96cf4eaab7fb5230118222366..3642b671e0aff79ca5378b97ba1d013265c1fb38 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,20 +67,22 @@ docker_debian-11-amd64:
IMG_NAME: "debian-11-amd64"
<<: *docker_build
-docker_debian-11-i386:
- variables:
- IMG_NAME: "debian-11-i386"
- <<: *docker_build
+# GPG error
+#docker_debian-11-i386:
+# variables:
+# IMG_NAME: "debian-11-i386"
+# <<: *docker_build
docker_debian-testing-amd64:
variables:
IMG_NAME: "debian-testing-amd64"
<<: *docker_build
-docker_debian-testing-i386:
- variables:
- IMG_NAME: "debian-testing-i386"
- <<: *docker_build
+# GPG error
+#docker_debian-testing-i386:
+# variables:
+# IMG_NAME: "debian-testing-i386"
+# <<: *docker_build
docker_fedora-25-amd64:
variables:
@@ -146,17 +148,17 @@ docker_ubuntu-14_04-amd64:
variables:
IMG_NAME: "ubuntu-14.04-amd64"
<<: *docker_build
-
+
docker_ubuntu-16_04-amd64:
variables:
IMG_NAME: "ubuntu-16.04-amd64"
<<: *docker_build
-
+
docker_ubuntu-18_04-amd64:
variables:
IMG_NAME: "ubuntu-18.04-amd64"
<<: *docker_build
-
+
docker_ubuntu-20_04-amd64:
variables:
IMG_NAME: "ubuntu-20.04-amd64"
@@ -167,10 +169,11 @@ docker_ubuntu-20_10-amd64:
IMG_NAME: "ubuntu-20.10-amd64"
<<: *docker_build
-docker_ubuntu-21_04-amd64:
- variables:
- IMG_NAME: "ubuntu-21.04-amd64"
- <<: *docker_build
+# GPG error
+#docker_ubuntu-21_04-amd64:
+# variables:
+# IMG_NAME: "ubuntu-21.04-amd64"
+# <<: *docker_build
docker_opensuse-15.0-amd64:
variables:
@@ -257,17 +260,17 @@ build-debian-11-amd64:
<<: *build-linux
image: registry.labs.nic.cz/labs/bird:debian-11-amd64
-build-debian-11-i386:
- <<: *build-linux
- image: registry.labs.nic.cz/labs/bird:debian-11-i386
+#build-debian-11-i386:
+# <<: *build-linux
+# image: registry.labs.nic.cz/labs/bird:debian-11-i386
build-debian-testing-amd64:
<<: *build-linux
image: registry.labs.nic.cz/labs/bird:debian-testing-amd64
-build-debian-testing-i386:
- <<: *build-linux
- image: registry.labs.nic.cz/labs/bird:debian-testing-i386
+#build-debian-testing-i386:
+# <<: *build-linux
+# image: registry.labs.nic.cz/labs/bird:debian-testing-i386
build-fedora-25-amd64:
<<: *build-linux
@@ -337,9 +340,9 @@ build-ubuntu-20_10-amd64:
<<: *build-linux
image: registry.labs.nic.cz/labs/bird:ubuntu-20.10-amd64
-build-ubuntu-21_04-amd64:
- <<: *build-linux
- image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64
+#build-ubuntu-21_04-amd64:
+# <<: *build-linux
+# image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64
build-opensuse-15.0-amd64:
<<: *build-linux
@@ -370,38 +373,147 @@ build-freebsd-11-i386:
- i386
-.pkg-debian: &pkg-debian
+.pkg-deb: &pkg-deb
stage: pkg
script:
- - pip3 install apkg
- - apkg build
- - apkg install -y pkg/pkgs/*/*/*.deb
-
+ - pip3 install apkg
+ - apkg build
+ #- apkg install -y pkg/pkgs/*/*/*.deb
+ artifacts:
+ paths:
+ - pkg/pkgs/*
+
+.pkg-rpm: &pkg-rpm
+ stage: pkg
+ script:
+ - pip3 install apkg
+ - apkg build
+ #- apkg install -y pkg/pkgs/*/*/*.rpm
+ artifacts:
+ paths:
+ - pkg/pkgs/*
+
+.pkg-rpm-wa: &pkg-rpm-wa
+ stage: pkg
+ script:
+ - sed -i "s/runstatedir/with-runtimedir/" distro/pkg/rpm/bird.spec
+ - pip3 install apkg
+ - apkg build
+ #- apkg install -y pkg/pkgs/*/*/*.rpm
+ artifacts:
+ paths:
+ - pkg/pkgs/*
+
+# Dpkg error: PATH is not set
+#pkg-debian-8-amd64:
+# <<: *pkg-deb
+# needs: [build-debian-8-amd64]
+# image: registry.labs.nic.cz/labs/bird:debian-8-amd64
+
+# Dpkg error: PATH is not set
+#pkg-debian-8-i386:
+# <<: *pkg-deb
+# needs: [build-debian-8-i386]
+# image: registry.labs.nic.cz/labs/bird:debian-8-i386
+
+# Dpkg error: PATH is not set
pkg-debian-9-amd64:
- <<: *pkg-debian
+ <<: *pkg-deb
needs: [build-debian-9-amd64]
image: registry.labs.nic.cz/labs/bird:debian-9-amd64
+# Dpkg error: PATH is not set
pkg-debian-9-i386:
- <<: *pkg-debian
+ <<: *pkg-deb
needs: [build-debian-9-i386]
image: registry.labs.nic.cz/labs/bird:debian-9-i386
pkg-debian-10-amd64:
- <<: *pkg-debian
+ <<: *pkg-deb
needs: [build-debian-10-amd64]
image: registry.labs.nic.cz/labs/bird:debian-10-amd64
pkg-debian-10-i386:
- <<: *pkg-debian
+ <<: *pkg-deb
needs: [build-debian-10-i386]
image: registry.labs.nic.cz/labs/bird:debian-10-i386
pkg-debian-11-amd64:
- <<: *pkg-debian
+ <<: *pkg-deb
needs: [build-debian-11-amd64]
image: registry.labs.nic.cz/labs/bird:debian-11-amd64
+pkg-fedora-30-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-fedora-30-amd64]
+ image: registry.labs.nic.cz/labs/bird:fedora-30-amd64
+
+pkg-fedora-31-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-fedora-31-amd64]
+ image: registry.labs.nic.cz/labs/bird:fedora-31-amd64
+
+pkg-fedora-32-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-fedora-32-amd64]
+ image: registry.labs.nic.cz/labs/bird:fedora-32-amd64
+
+pkg-fedora-33-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-fedora-33-amd64]
+ image: registry.labs.nic.cz/labs/bird:fedora-33-amd64
+
+pkg-fedora-34-amd64:
+ <<: *pkg-rpm
+ needs: [build-fedora-34-amd64]
+ image: registry.labs.nic.cz/labs/bird:fedora-34-amd64
+
+# UnicodeDecodeError
+#pkg-centos-7-amd64:
+# <<: *pkg-rpm-wa
+# needs: [build-centos-7-amd64]
+# image: registry.labs.nic.cz/labs/bird:centos-7-amd64
+
+pkg-centos-8-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-centos-8-amd64]
+ image: registry.labs.nic.cz/labs/bird:centos-8-amd64
+
+pkg-ubuntu-18.04-amd64:
+ <<: *pkg-deb
+ needs: [build-ubuntu-18_04-amd64]
+ image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64
+
+pkg-ubuntu-20.04-amd64:
+ <<: *pkg-deb
+ needs: [build-ubuntu-20_04-amd64]
+ image: registry.labs.nic.cz/labs/bird:ubuntu-20.04-amd64
+
+pkg-ubuntu-20.10-amd64:
+ <<: *pkg-deb
+ needs: [build-ubuntu-20_10-amd64]
+ image: registry.labs.nic.cz/labs/bird:ubuntu-20.10-amd64
+
+#pkg-ubuntu-21.04-amd64:
+# <<: *pkg-deb
+# needs: [build-ubuntu-21_04-amd64]
+# image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64
+
+pkg-opensuse-15.1-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-opensuse-15.1-amd64]
+ image: registry.labs.nic.cz/labs/bird:opensuse-15.1-amd64
+
+pkg-opensuse-15.2-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-opensuse-15.2-amd64]
+ image: registry.labs.nic.cz/labs/bird:opensuse-15.2-amd64
+
+pkg-opensuse-15.3-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-opensuse-15.3-amd64]
+ image: registry.labs.nic.cz/labs/bird:opensuse-15.3-amd64
+
build-birdlab:
stage: build
@@ -454,10 +566,10 @@ test-ospf-ptmp:
variables:
TEST_NAME: cf-ospf-ptmp
-# test-ospf-authentication:
-# <<: *test-base
-# variables:
-# TEST_NAME: cf-ospf-authentication
+test-ospf-authentication:
+ <<: *test-base
+ variables:
+ TEST_NAME: cf-ospf-authentication
test-ospf-bfd:
<<: *test-base
diff --git a/misc/docker/centos-7-amd64/Dockerfile b/misc/docker/centos-7-amd64/Dockerfile
index c01731b2f12599776fa4df06e289a9fabdca791c..bef04b00ae8d9707894a247d737f9c6a6286ee36 100644
--- a/misc/docker/centos-7-amd64/Dockerfile
+++ b/misc/docker/centos-7-amd64/Dockerfile
@@ -1,11 +1,18 @@
FROM centos:7
RUN yum -y upgrade
RUN yum -y install \
- autoconf \
+ gcc \
+ make \
flex \
bison \
- pkgconfig \
- 'readline-devel' \
- 'pkgconfig(ncurses)' \
- gcc \
- make
+ autoconf \
+ libssh-devel \
+ ncurses-devel \
+ readline-devel
+RUN yum -y install \
+ git \
+ rpm-build \
+ systemd \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/centos-8-amd64/Dockerfile b/misc/docker/centos-8-amd64/Dockerfile
index ed1081ed4714ad399c13d8ed8d710dc6a9d7bcae..3bc5acc393a05f282ce74b02bd15c58528bb678d 100644
--- a/misc/docker/centos-8-amd64/Dockerfile
+++ b/misc/docker/centos-8-amd64/Dockerfile
@@ -1,11 +1,18 @@
FROM centos:8
RUN yum -y upgrade
RUN yum -y install \
- autoconf \
+ gcc \
+ make \
flex \
bison \
- pkgconfig \
- 'readline-devel' \
- 'pkgconfig(ncurses)' \
- gcc \
- make
+ autoconf \
+ libssh-devel \
+ ncurses-devel \
+ readline-devel
+RUN yum -y install \
+ git \
+ rpm-build \
+ systemd-rpm-macros \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/debian-10-amd64/Dockerfile b/misc/docker/debian-10-amd64/Dockerfile
index d91322cd9806e8189365167a0490a41b11ada7f1..a241bb238db2897faad33edab749ec349369f5f6 100644
--- a/misc/docker/debian-10-amd64/Dockerfile
+++ b/misc/docker/debian-10-amd64/Dockerfile
@@ -4,10 +4,10 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev \
libssh-gcrypt-dev \
diff --git a/misc/docker/debian-10-i386/Dockerfile b/misc/docker/debian-10-i386/Dockerfile
index 878f5a7e9f9197afa9b41199b9a637a6b18ee64c..6b28a20a25fee009a27e919a1f7e476fbf22bb2f 100644
--- a/misc/docker/debian-10-i386/Dockerfile
+++ b/misc/docker/debian-10-i386/Dockerfile
@@ -4,10 +4,10 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev \
libssh-gcrypt-dev \
diff --git a/misc/docker/debian-11-amd64/Dockerfile b/misc/docker/debian-11-amd64/Dockerfile
index e91a8b3a637d3771c5af30117a116e435483b477..a9aee7e9dd8d0182c77cc5c721c5f6b63df3c076 100644
--- a/misc/docker/debian-11-amd64/Dockerfile
+++ b/misc/docker/debian-11-amd64/Dockerfile
@@ -1,14 +1,13 @@
FROM amd64/debian:bullseye-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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev \
libssh-gcrypt-dev \
diff --git a/misc/docker/debian-11-i386/Dockerfile b/misc/docker/debian-11-i386/Dockerfile
index d599dbfcd558aad6a943515eb2f8e567a2a7dbf1..5b5ad5a369131e450dd52c13a335890284aa6372 100644
--- a/misc/docker/debian-11-i386/Dockerfile
+++ b/misc/docker/debian-11-i386/Dockerfile
@@ -1,13 +1,25 @@
FROM i386/debian:bullseye-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 install \
- autoconf \
+RUN apt-get -y --no-install-recommends install \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
- libreadline-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 \
+ quilt \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/debian-7-amd64/Dockerfile b/misc/docker/debian-7-amd64/Dockerfile
index a4a3841ef9224f9c91e4930bbc5737c4d2ff8bc0..9510e9cf5929367663f52bb13d74341a46ccb721 100644
--- a/misc/docker/debian-7-amd64/Dockerfile
+++ b/misc/docker/debian-7-amd64/Dockerfile
@@ -5,9 +5,9 @@ RUN echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >>
RUN apt-get -y update -o Acquire::Check-Valid-Until=false
RUN apt-get -y upgrade
RUN apt-get -y install \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev
diff --git a/misc/docker/debian-7-i386/Dockerfile b/misc/docker/debian-7-i386/Dockerfile
index aa9019ced48056c1a07946b7f8128f6b81cfde5b..d47d8e08a93e9dead5b3253cd0c51a28b6cfc0a2 100644
--- a/misc/docker/debian-7-i386/Dockerfile
+++ b/misc/docker/debian-7-i386/Dockerfile
@@ -5,9 +5,9 @@ RUN echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >>
RUN apt-get -y update -o Acquire::Check-Valid-Until=false
RUN apt-get -y upgrade
RUN apt-get -y install \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev
diff --git a/misc/docker/debian-8-amd64/Dockerfile b/misc/docker/debian-8-amd64/Dockerfile
index d0e8ed0aa11ff541e6cbe72d036649b78f6c170c..d95201327caa38372eaa96b068da6d7112eef1b6 100644
--- a/misc/docker/debian-8-amd64/Dockerfile
+++ b/misc/docker/debian-8-amd64/Dockerfile
@@ -4,9 +4,9 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev
diff --git a/misc/docker/debian-8-i386/Dockerfile b/misc/docker/debian-8-i386/Dockerfile
index 9dd6f022159756c320880727b1c1e65d654a3b8b..349fcee9896947cb7a5829e3a09032ada19b7c06 100644
--- a/misc/docker/debian-8-i386/Dockerfile
+++ b/misc/docker/debian-8-i386/Dockerfile
@@ -4,9 +4,9 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev
diff --git a/misc/docker/debian-9-amd64/Dockerfile b/misc/docker/debian-9-amd64/Dockerfile
index e3b19657d8c8fd2190d01ea69784bda60677a071..4e8603f09020b6bea15e705dfed8d77c9168dbe5 100644
--- a/misc/docker/debian-9-amd64/Dockerfile
+++ b/misc/docker/debian-9-amd64/Dockerfile
@@ -4,10 +4,10 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev \
libssh-gcrypt-dev \
diff --git a/misc/docker/debian-9-i386/Dockerfile b/misc/docker/debian-9-i386/Dockerfile
index 52effbbf03888d152f219d7ebfb8932b83f2b5d3..d37a742da0be1613e72d1c72523280bf505ba3f8 100644
--- a/misc/docker/debian-9-i386/Dockerfile
+++ b/misc/docker/debian-9-i386/Dockerfile
@@ -4,10 +4,10 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev \
libssh-gcrypt-dev \
diff --git a/misc/docker/debian-testing-amd64/Dockerfile b/misc/docker/debian-testing-amd64/Dockerfile
index 3b66e3fa1b5d7192308036f9c562f7a5afaf8b85..6d7bbbeba395f757db7c983c76b2ac64bbca3f24 100644
--- a/misc/docker/debian-testing-amd64/Dockerfile
+++ b/misc/docker/debian-testing-amd64/Dockerfile
@@ -4,9 +4,9 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev
diff --git a/misc/docker/debian-testing-i386/Dockerfile b/misc/docker/debian-testing-i386/Dockerfile
index 998ce969544e7539764a16e1a89a5c00c7e19db7..3d6a969cc977006f34ddd2256e958894a043c7d5 100644
--- a/misc/docker/debian-testing-i386/Dockerfile
+++ b/misc/docker/debian-testing-i386/Dockerfile
@@ -4,9 +4,9 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev
diff --git a/misc/docker/fedora-30-amd64/Dockerfile b/misc/docker/fedora-30-amd64/Dockerfile
index 57561422d71ec0e82074cd835d3b3e40dd824856..d9aaa62a2699254cb0ee79056d3bfdf9028dfd25 100644
--- a/misc/docker/fedora-30-amd64/Dockerfile
+++ b/misc/docker/fedora-30-amd64/Dockerfile
@@ -1,11 +1,18 @@
FROM fedora:30
-RUN dnf -y upgrade
+RUN dnf -y update
RUN dnf -y install \
+ gcc \
make \
- autoconf \
flex \
bison \
- pkgconfig \
- 'readline-devel' \
- 'pkgconfig(ncurses)' \
- gcc
+ autoconf \
+ libssh-devel \
+ ncurses-devel \
+ readline-devel
+RUN dnf -y install \
+ git \
+ rpm-build \
+ systemd-rpm-macros \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/fedora-31-amd64/Dockerfile b/misc/docker/fedora-31-amd64/Dockerfile
index 48e410e6db9e61febec5f3dce77139ccf895b64e..9f7ad0cd717444cc6b772803c767116a576e947d 100644
--- a/misc/docker/fedora-31-amd64/Dockerfile
+++ b/misc/docker/fedora-31-amd64/Dockerfile
@@ -1,11 +1,18 @@
FROM fedora:31
-RUN dnf -y upgrade
+RUN dnf -y update
RUN dnf -y install \
+ gcc \
make \
- autoconf \
flex \
bison \
- pkgconfig \
- 'readline-devel' \
- 'pkgconfig(ncurses)' \
- gcc
+ autoconf \
+ libssh-devel \
+ ncurses-devel \
+ readline-devel
+RUN dnf -y install \
+ git \
+ rpm-build \
+ systemd-rpm-macros \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/fedora-32-amd64/Dockerfile b/misc/docker/fedora-32-amd64/Dockerfile
index 6c8d6dacab355a24330d96c18d9d7936d71aac68..609dbf33e9fea908965189bddd16501ccd3e7246 100644
--- a/misc/docker/fedora-32-amd64/Dockerfile
+++ b/misc/docker/fedora-32-amd64/Dockerfile
@@ -1,13 +1,18 @@
FROM fedora:32
-
-RUN dnf -y update && dnf -y upgrade
+RUN dnf -y update
RUN dnf -y install \
- make \
- autoconf \
- flex \
- bison \
- pkgconfig \
- "readline-devel" \
- "pkgconfig(ncurses)" \
- gcc
-
+ gcc \
+ make \
+ flex \
+ bison \
+ autoconf \
+ libssh-devel \
+ ncurses-devel \
+ readline-devel
+RUN dnf -y install \
+ git \
+ rpm-build \
+ systemd-rpm-macros \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/fedora-33-amd64/Dockerfile b/misc/docker/fedora-33-amd64/Dockerfile
index 5551fe53a43ce21be1c42f19eea352e2a6b39d42..7e7070687323dcbc8d926655606952719bf7a601 100644
--- a/misc/docker/fedora-33-amd64/Dockerfile
+++ b/misc/docker/fedora-33-amd64/Dockerfile
@@ -1,13 +1,18 @@
FROM fedora:33
-
-RUN dnf -y update && dnf -y upgrade
+RUN dnf -y upgrade
RUN dnf -y install \
- make \
- autoconf \
- flex \
- bison \
- pkgconfig \
- "readline-devel" \
- "pkgconfig(ncurses)" \
- gcc
-
+ gcc \
+ make \
+ flex \
+ bison \
+ autoconf \
+ libssh-devel \
+ ncurses-devel \
+ readline-devel
+RUN dnf -y install \
+ git \
+ rpm-build \
+ systemd-rpm-macros \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/fedora-34-amd64/Dockerfile b/misc/docker/fedora-34-amd64/Dockerfile
index ef78db2d0b091159ed4a886581c82d96566d5654..6bd775296db8c3877f143a5df3fdb69a64d0c908 100644
--- a/misc/docker/fedora-34-amd64/Dockerfile
+++ b/misc/docker/fedora-34-amd64/Dockerfile
@@ -1,13 +1,18 @@
FROM fedora:34
-
-RUN dnf -y update && dnf -y upgrade
+RUN dnf -y upgrade
RUN dnf -y install \
- make \
- autoconf \
- flex \
- bison \
- pkgconfig \
- "readline-devel" \
- "pkgconfig(ncurses)" \
- gcc
-
+ gcc \
+ make \
+ flex \
+ bison \
+ autoconf \
+ libssh-devel \
+ ncurses-devel \
+ readline-devel
+RUN dnf -y install \
+ git \
+ rpm-build \
+ systemd-rpm-macros \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/opensuse-15.1-amd64/Dockerfile b/misc/docker/opensuse-15.1-amd64/Dockerfile
index 29d956cffd7987b32d5d16a7080aa29924592c3b..77a0455d20395a23ff9767f6da31b6c7f566ce8e 100644
--- a/misc/docker/opensuse-15.1-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.1-amd64/Dockerfile
@@ -1,11 +1,19 @@
FROM opensuse/leap:15.1
RUN zypper -n up
RUN zypper -n install \
- autoconf \
+ gcc \
+ make \
flex \
bison \
- pkgconfig \
- readline-devel \
+ autoconf \
+ libssh-devel \
ncurses-devel \
- gcc \
- gmake
+ readline-devel
+RUN zypper -n install \
+ git \
+ rpm-build \
+ systemd \
+ systemd-rpm-macros \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/opensuse-15.2-amd64/Dockerfile b/misc/docker/opensuse-15.2-amd64/Dockerfile
index d1acd5c401b1499cbf9a1a99f7d180247c2c1cc6..44a146db079697a2765c7a0efaf5227f1eb0b3f4 100644
--- a/misc/docker/opensuse-15.2-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.2-amd64/Dockerfile
@@ -1,12 +1,19 @@
FROM opensuse/leap:15.2
-
RUN zypper -n up
RUN zypper -n install \
- autoconf \
+ gcc \
+ make \
flex \
bison \
- pkgconfig \
- readline-devel \
+ autoconf \
+ libssh-devel \
ncurses-devel \
- gcc \
- gmake
+ readline-devel
+RUN zypper -n install \
+ git \
+ rpm-build \
+ systemd \
+ systemd-rpm-macros \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/opensuse-15.3-amd64/Dockerfile b/misc/docker/opensuse-15.3-amd64/Dockerfile
index 4515e3be132ed289958ac3d582e0bf7415e98e36..9fe8f4c2a2db0cb74e57a20e56f1a9932f937f8c 100644
--- a/misc/docker/opensuse-15.3-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.3-amd64/Dockerfile
@@ -1,12 +1,19 @@
FROM opensuse/leap:15.3
-
RUN zypper -n up
RUN zypper -n install \
- autoconf \
+ gcc \
+ make \
flex \
bison \
- pkgconfig \
- readline-devel \
+ autoconf \
+ libssh-devel \
ncurses-devel \
- gcc \
- gmake
+ readline-devel
+RUN zypper -n install \
+ git \
+ rpm-build \
+ systemd \
+ systemd-rpm-macros \
+ python3 \
+ python3-pip \
+ python3-setuptools
diff --git a/misc/docker/ubuntu-14.04-amd64/Dockerfile b/misc/docker/ubuntu-14.04-amd64/Dockerfile
index ccac3eb42092fabff77e843daaaae47cdef1ee3a..353250733f4dc90a3feaf8f4945beda6acb253c0 100644
--- a/misc/docker/ubuntu-14.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-14.04-amd64/Dockerfile
@@ -4,9 +4,9 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev
diff --git a/misc/docker/ubuntu-16.04-amd64/Dockerfile b/misc/docker/ubuntu-16.04-amd64/Dockerfile
index 50a4918c8e78c1625bc396deba8a5cf578d12604..c27aef150251ebc2d73018096585f2632a9da7b4 100644
--- a/misc/docker/ubuntu-16.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-16.04-amd64/Dockerfile
@@ -4,9 +4,9 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
libreadline-dev
diff --git a/misc/docker/ubuntu-18.04-amd64/Dockerfile b/misc/docker/ubuntu-18.04-amd64/Dockerfile
index c68d897255d1f8566b1958c8c4438d28fe41a3ea..a1d95317503c9e6f16d553e061ce1cc44b891c1f 100644
--- a/misc/docker/ubuntu-18.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-18.04-amd64/Dockerfile
@@ -4,9 +4,24 @@ 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 \
- autoconf \
build-essential \
flex \
bison \
+ autoconf \
ncurses-dev \
- libreadline-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 --git a/misc/docker/ubuntu-20.04-amd64/Dockerfile b/misc/docker/ubuntu-20.04-amd64/Dockerfile
index 4b773697122003b7e3c7eb49ee25d756d62b8c36..fac1b3338ca58cd9d690d2d67962f66100ad1b5a 100644
--- a/misc/docker/ubuntu-20.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-20.04-amd64/Dockerfile
@@ -1,14 +1,27 @@
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 install \
- autoconf \
- build-essential \
- flex \
- bison \
- ncurses-dev \
- libreadline-dev \
-
+ 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 --git a/misc/docker/ubuntu-20.10-amd64/Dockerfile b/misc/docker/ubuntu-20.10-amd64/Dockerfile
index 0c135280c9a8b5616c82d82a5067f810005470f8..19cb1b858e0fed09f3a5541125bd8c5250f612dd 100644
--- a/misc/docker/ubuntu-20.10-amd64/Dockerfile
+++ b/misc/docker/ubuntu-20.10-amd64/Dockerfile
@@ -1,14 +1,27 @@
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 \
- autoconf \
- build-essential \
- flex \
- bison \
- ncurses-dev \
- libreadline-dev \
-
+ 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 --git a/misc/docker/ubuntu-21.04-amd64/Dockerfile b/misc/docker/ubuntu-21.04-amd64/Dockerfile
index 64dc2f332c5a8b785c479e73982055b139a2afd1..1c32727b1e969ac17462308eca9c9c76c1960ae9 100644
--- a/misc/docker/ubuntu-21.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-21.04-amd64/Dockerfile
@@ -1,14 +1,27 @@
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 install \
- autoconf \
- build-essential \
- flex \
- bison \
- ncurses-dev \
- libreadline-dev
-
+ 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