Update build and package targets

Fedora builds for 32-41, Debian up to 12, Ubuntu up to 24.10.

Includes autorebuilder if a Dockerfile changes.

The CI file is obnoxiously boilerplaty. TODO: generate it from a list?

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be5c317f0391789fb17c391eff77ed8032752d13..27b35fb3da8e8f369baf93601644b03b8e43b765 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,6 @@ stages:
 
 .docker: &docker_build
   stage: image
-  allow_failure: true
   script:
   - $DOCKER_CMD login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.nic.cz
   # Make sure we refresh the base image if it updates (eg. security updates, etc)
@@ -48,11 +47,160 @@ docker-docbuilder:
     IMG_NAME: "docbuilder"
   <<: *docker_build
 
-# Docker build example
-#docker_debian-11-amd64:
-#  variables:
-#    IMG_NAME: "debian-11-amd64"
-#  <<: *docker_build
+docker-debian-9-amd64:
+  variables:
+    IMG_NAME: "debian-9-amd64"
+  <<: *docker_build
+
+docker-debian-9-i386:
+  variables:
+    IMG_NAME: "debian-9-i386"
+  <<: *docker_build
+
+docker-debian-10-amd64:
+  variables:
+    IMG_NAME: "debian-10-amd64"
+  <<: *docker_build
+
+docker-debian-10-i386:
+  variables:
+    IMG_NAME: "debian-10-i386"
+  <<: *docker_build
+
+docker-debian-11-amd64:
+  variables:
+    IMG_NAME: "debian-11-amd64"
+  <<: *docker_build
+
+docker-debian-11-i386:
+  variables:
+    IMG_NAME: "debian-11-i386"
+  <<: *docker_build
+
+docker-debian-12-amd64:
+  variables:
+    IMG_NAME: "debian-12-amd64"
+  <<: *docker_build
+
+docker-debian-12-i386:
+  variables:
+    IMG_NAME: "debian-12-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
+
+docker-fedora-32-amd64:
+  variables:
+    IMG_NAME: "fedora-32-amd64"
+  <<: *docker_build
+
+docker-fedora-33-amd64:
+  variables:
+    IMG_NAME: "fedora-33-amd64"
+  <<: *docker_build
+
+docker-fedora-34-amd64:
+  variables:
+    IMG_NAME: "fedora-34-amd64"
+  <<: *docker_build
+
+docker-fedora-35-amd64:
+  variables:
+    IMG_NAME: "fedora-35-amd64"
+  <<: *docker_build
+
+docker-fedora-36-amd64:
+  variables:
+    IMG_NAME: "fedora-36-amd64"
+  <<: *docker_build
+
+docker-fedora-37-amd64:
+  variables:
+    IMG_NAME: "fedora-37-amd64"
+  <<: *docker_build
+
+docker-fedora-38-amd64:
+  variables:
+    IMG_NAME: "fedora-38-amd64"
+  <<: *docker_build
+
+docker-fedora-39-amd64:
+  variables:
+    IMG_NAME: "fedora-39-amd64"
+  <<: *docker_build
+
+docker-fedora-40-amd64:
+  variables:
+    IMG_NAME: "fedora-40-amd64"
+  <<: *docker_build
+
+docker-fedora-41-amd64:
+  variables:
+    IMG_NAME: "fedora-41-amd64"
+  <<: *docker_build
+
+docker-centos-8-amd64:
+  variables:
+    IMG_NAME: "centos-8-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"
+  <<: *docker_build
+
+docker-ubuntu-22_04-amd64:
+  variables:
+    IMG_NAME: "ubuntu-22.04-amd64"
+  <<: *docker_build
+
+docker-ubuntu-24_04-amd64:
+  variables:
+    IMG_NAME: "ubuntu-24.04-amd64"
+  <<: *docker_build
+
+docker-ubuntu-24_10-amd64:
+  variables:
+    IMG_NAME: "ubuntu-24.10-amd64"
+  <<: *docker_build
+
+docker-opensuse-15.0-amd64:
+  variables:
+    IMG_NAME: "opensuse-15.0-amd64"
+  <<: *docker_build
+
+docker-opensuse-15.1-amd64:
+  variables:
+    IMG_NAME: "opensuse-15.1-amd64"
+  <<: *docker_build
+
+docker-opensuse-15.2-amd64:
+  variables:
+    IMG_NAME: "opensuse-15.2-amd64"
+  <<: *docker_build
+
+docker-opensuse-15.3-amd64:
+  variables:
+    IMG_NAME: "opensuse-15.3-amd64"
+  <<: *docker_build
 
 
 .build: &build-base
@@ -112,61 +260,65 @@ build-debian-11-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:debian-11-amd64
 
-#build-debian-11-i386:
-#  <<: *build-linux
-#  image: registry.nic.cz/labs/bird:debian-11-i386
+build-debian-11-i386:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:debian-11-i386
+
+build-debian-12-amd64:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:debian-12-amd64
+
+build-debian-12-i386:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:debian-12-i386
 
 build-debian-testing-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:debian-testing-amd64
 
-#build-debian-testing-i386:
-#  <<: *build-linux
-#  image: registry.nic.cz/labs/bird:debian-testing-i386
-
-build-fedora-25-amd64:
+build-debian-testing-i386:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-25-amd64
+  image: registry.nic.cz/labs/bird:debian-testing-i386
 
-build-fedora-26-amd64:
+build-fedora-32-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-26-amd64
+  image: registry.nic.cz/labs/bird:fedora-32-amd64
 
-build-fedora-27-amd64:
+build-fedora-33-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-27-amd64
+  image: registry.nic.cz/labs/bird:fedora-33-amd64
 
-build-fedora-28-amd64:
+build-fedora-34-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-28-amd64
+  image: registry.nic.cz/labs/bird:fedora-34-amd64
 
-build-fedora-29-amd64:
+build-fedora-35-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-29-amd64
+  image: registry.nic.cz/labs/bird:fedora-35-amd64
 
-build-fedora-30-amd64:
+build-fedora-36-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-30-amd64
+  image: registry.nic.cz/labs/bird:fedora-36-amd64
 
-build-fedora-31-amd64:
+build-fedora-37-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-31-amd64
+  image: registry.nic.cz/labs/bird:fedora-37-amd64
 
-build-fedora-32-amd64:
+build-fedora-38-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-32-amd64
+  image: registry.nic.cz/labs/bird:fedora-38-amd64
 
-build-fedora-33-amd64:
+build-fedora-39-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-33-amd64
+  image: registry.nic.cz/labs/bird:fedora-39-amd64
 
-build-fedora-34-amd64:
+build-fedora-40-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:fedora-33-amd64
+  image: registry.nic.cz/labs/bird:fedora-40-amd64
 
-#build-centos-7-amd64:
-#  <<: *build-linux
-#  image: registry.nic.cz/labs/bird:centos-7-amd64
+build-fedora-41-amd64:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:fedora-41-amd64
 
 build-centos-8-amd64:
   <<: *build-linux
@@ -184,13 +336,17 @@ build-ubuntu-20_04-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64
 
-build-ubuntu-21_10-amd64:
+build-ubuntu-22_04-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-21_04-amd64:
-#  <<: *build-linux
-#  image: registry.nic.cz/labs/bird:ubuntu-21.04-amd64
+build-ubuntu-24_04-amd64:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64
+
+build-ubuntu-24_10-amd64:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64
 
 build-opensuse-15.0-amd64:
   <<: *build-linux
@@ -337,15 +493,20 @@ pkg-debian-11-amd64:
   needs: [build-debian-11-amd64]
   image: registry.nic.cz/labs/bird:debian-11-amd64
 
-pkg-fedora-30-amd64:
-  <<: *pkg-rpm-wa
-  needs: [build-fedora-30-amd64]
-  image: registry.nic.cz/labs/bird:fedora-30-amd64
+pkg-debian-11-i386:
+  <<: *pkg-deb
+  needs: [build-debian-11-i386]
+  image: registry.nic.cz/labs/bird:debian-11-i386
 
-pkg-fedora-31-amd64:
-  <<: *pkg-rpm-wa
-  needs: [build-fedora-31-amd64]
-  image: registry.nic.cz/labs/bird:fedora-31-amd64
+pkg-debian-12-amd64:
+  <<: *pkg-deb
+  needs: [build-debian-12-amd64]
+  image: registry.nic.cz/labs/bird:debian-12-amd64
+
+pkg-debian-12-i386:
+  <<: *pkg-deb
+  needs: [build-debian-12-i386]
+  image: registry.nic.cz/labs/bird:debian-12-i386
 
 pkg-fedora-32-amd64:
   <<: *pkg-rpm-wa
@@ -362,6 +523,41 @@ pkg-fedora-34-amd64:
   needs: [build-fedora-34-amd64]
   image: registry.nic.cz/labs/bird:fedora-34-amd64
 
+pkg-fedora-35-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-35-amd64]
+  image: registry.nic.cz/labs/bird:fedora-35-amd64
+
+pkg-fedora-36-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-36-amd64]
+  image: registry.nic.cz/labs/bird:fedora-36-amd64
+
+pkg-fedora-37-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-37-amd64]
+  image: registry.nic.cz/labs/bird:fedora-37-amd64
+
+pkg-fedora-38-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-38-amd64]
+  image: registry.nic.cz/labs/bird:fedora-38-amd64
+
+pkg-fedora-39-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-39-amd64]
+  image: registry.nic.cz/labs/bird:fedora-39-amd64
+
+pkg-fedora-40-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-40-amd64]
+  image: registry.nic.cz/labs/bird:fedora-40-amd64
+
+pkg-fedora-41-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-41-amd64]
+  image: registry.nic.cz/labs/bird:fedora-41-amd64
+
 #pkg-centos-7-amd64:
 #  <<: *pkg-rpm-wa
 #  variables:
@@ -386,16 +582,20 @@ 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-deb
+  needs: [build-ubuntu-22_04-amd64]
+  image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64
 
-pkg-ubuntu-21.10-amd64:
+pkg-ubuntu-24.04-amd64:
   <<: *pkg-deb
-  needs: [build-ubuntu-21_10-amd64]
-  image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64
+  needs: [build-ubuntu-24_04-amd64]
+  image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64
 
-#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-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 --git a/misc/docker/centos-6-amd64/Dockerfile b/misc/docker/centos-6-amd64/Dockerfile
deleted file mode 100644 (file)
index d92f64f..0000000
--- a/misc/docker/centos-6-amd64/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM centos:6
-RUN yum -y upgrade
-RUN yum -y install \
-       autoconf \
-       flex \
-       bison \
-       pkgconfig \
-       'readline-devel' \
-       'pkgconfig(ncurses)' \
-       gcc \
-       make

diff --git a/misc/docker/debian-11-i386/Dockerfile b/misc/docker/debian-11-i386/Dockerfile
index 5b5ad5a369131e450dd52c13a335890284aa6372..1edb4579cef64d7cfba1f8221d8d247f80168ece 100644 (file)
--- a/misc/docker/debian-11-i386/Dockerfile
+++ b/misc/docker/debian-11-i386/Dockerfile
@@ -1,6 +1,6 @@
+# bump number for image rebuild: 1
 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 --no-install-recommends install \
        build-essential \

diff --git a/misc/docker/ubuntu-21.10-amd64/Dockerfile b/misc/docker/debian-12-amd64/Dockerfile
similarity index 74%
rename from misc/docker/ubuntu-21.10-amd64/Dockerfile
rename to misc/docker/debian-12-amd64/Dockerfile
index aa0987b64a7bdf9d1dd95ce3802944fca52a27df..3c6b43dd6e757a46a80e0e340b67a126b2b9fb09 100644 (file)
--- a/misc/docker/ubuntu-21.10-amd64/Dockerfile
+++ b/misc/docker/debian-12-amd64/Dockerfile
@@ -1,10 +1,9 @@
-FROM ubuntu:21.10
+# 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 \
-       tzdata \
        build-essential \
        flex \
        bison \
@@ -17,11 +16,10 @@ RUN apt-get -y --no-install-recommends install \
        opensp \
        docbook-xsl \
        xsltproc
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
        git \
        dpkg-dev \
        debhelper \
-       apt-utils \
        quilt \
        python3 \
        python3-pip \

diff --git a/misc/docker/debian-12-i386/Dockerfile b/misc/docker/debian-12-i386/Dockerfile
new file mode 100644 (file)
index 0000000..414178f
--- /dev/null
+++ b/misc/docker/debian-12-i386/Dockerfile
@@ -0,0 +1,25 @@
+# bump number for image rebuild: 1
+FROM i386/debian:bookworm-slim
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get -y update && apt-get -y upgrade
+RUN apt-get -y --no-install-recommends 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 --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
deleted file mode 100644 (file)
index 9510e9c..0000000
--- a/misc/docker/debian-7-amd64/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM debian:wheezy-slim
-ENV DEBIAN_FRONTEND noninteractive
-RUN echo 'deb http://archive.debian.org/debian/ wheezy main' > /etc/apt/sources.list
-RUN echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >> /etc/apt/sources.list
-RUN apt-get -y update -o Acquire::Check-Valid-Until=false
-RUN apt-get -y upgrade
-RUN apt-get -y install \
-       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
deleted file mode 100644 (file)
index d47d8e0..0000000
--- a/misc/docker/debian-7-i386/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM i386/debian:wheezy-slim
-ENV DEBIAN_FRONTEND noninteractive
-RUN echo 'deb http://archive.debian.org/debian/ wheezy main' > /etc/apt/sources.list
-RUN echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >> /etc/apt/sources.list
-RUN apt-get -y update -o Acquire::Check-Valid-Until=false
-RUN apt-get -y upgrade
-RUN apt-get -y install \
-       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
deleted file mode 100644 (file)
index d952013..0000000
--- a/misc/docker/debian-8-amd64/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM debian:jessie-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 install \
-       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
deleted file mode 100644 (file)
index 349fcee..0000000
--- a/misc/docker/debian-8-i386/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM i386/debian:jessie-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 install \
-       build-essential \
-       flex \
-       bison \
-       autoconf \
-       ncurses-dev \
-       libreadline-dev

diff --git a/misc/docker/debian-testing-amd64/Dockerfile b/misc/docker/debian-testing-amd64/Dockerfile
index 6d7bbbeba395f757db7c983c76b2ac64bbca3f24..e377cf32142f2e5502f10b84a0681e9b54db4152 100644 (file)
--- a/misc/docker/debian-testing-amd64/Dockerfile
+++ b/misc/docker/debian-testing-amd64/Dockerfile
@@ -1,6 +1,5 @@
 FROM debian:testing-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 install \

diff --git a/misc/docker/debian-testing-i386/Dockerfile b/misc/docker/debian-testing-i386/Dockerfile
index 3d6a969cc977006f34ddd2256e958894a043c7d5..1c16c0fa05f0370fc564b65733f804aff1a56ffd 100644 (file)
--- a/misc/docker/debian-testing-i386/Dockerfile
+++ b/misc/docker/debian-testing-i386/Dockerfile
@@ -1,6 +1,5 @@
 FROM i386/debian:testing-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 install \

diff --git a/misc/docker/fedora-25-amd64/Dockerfile b/misc/docker/fedora-25-amd64/Dockerfile
deleted file mode 100644 (file)
index d0dd8f6..0000000
--- a/misc/docker/fedora-25-amd64/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM fedora:25
-RUN dnf -y upgrade
-RUN dnf -y install \
-       make \
-       autoconf \
-       flex \
-       bison \
-       pkgconfig \
-       'readline-devel' \
-       'pkgconfig(ncurses)' \
-       gcc

diff --git a/misc/docker/fedora-26-amd64/Dockerfile b/misc/docker/fedora-26-amd64/Dockerfile
deleted file mode 100644 (file)
index f15ba40..0000000
--- a/misc/docker/fedora-26-amd64/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM fedora:26
-RUN dnf -y upgrade
-RUN dnf -y install \
-       make \
-       autoconf \
-       flex \
-       bison \
-       pkgconfig \
-       'readline-devel' \
-       'pkgconfig(ncurses)' \
-       gcc

diff --git a/misc/docker/fedora-27-amd64/Dockerfile b/misc/docker/fedora-27-amd64/Dockerfile
deleted file mode 100644 (file)
index e317459..0000000
--- a/misc/docker/fedora-27-amd64/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM fedora:27
-RUN dnf -y upgrade
-RUN dnf -y install \
-       make \
-       autoconf \
-       flex \
-       bison \
-       pkgconfig \
-       'readline-devel' \
-       'pkgconfig(ncurses)' \
-       gcc

diff --git a/misc/docker/fedora-28-amd64/Dockerfile b/misc/docker/fedora-28-amd64/Dockerfile
deleted file mode 100644 (file)
index 0aa2f74..0000000
--- a/misc/docker/fedora-28-amd64/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM fedora:28
-RUN dnf -y upgrade
-RUN dnf -y install \
-       make \
-       autoconf \
-       flex \
-       bison \
-       pkgconfig \
-       'readline-devel' \
-       'pkgconfig(ncurses)' \
-       gcc

diff --git a/misc/docker/fedora-29-amd64/Dockerfile b/misc/docker/fedora-29-amd64/Dockerfile
deleted file mode 100644 (file)
index afc1f0c..0000000
--- a/misc/docker/fedora-29-amd64/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM fedora:29
-RUN dnf -y upgrade
-RUN dnf -y install \
-       make \
-       autoconf \
-       flex \
-       bison \
-       pkgconfig \
-       'readline-devel' \
-       'pkgconfig(ncurses)' \
-       gcc

diff --git a/misc/docker/fedora-30-amd64/Dockerfile b/misc/docker/fedora-35-amd64/Dockerfile
similarity index 86%
rename from misc/docker/fedora-30-amd64/Dockerfile
rename to misc/docker/fedora-35-amd64/Dockerfile
index d9aaa62a2699254cb0ee79056d3bfdf9028dfd25..dee5d2469e0ec6046f47ecc40746b00954b47516 100644 (file)
--- a/misc/docker/fedora-30-amd64/Dockerfile
+++ b/misc/docker/fedora-35-amd64/Dockerfile
@@ -1,5 +1,5 @@
-FROM fedora:30
-RUN dnf -y update
+FROM fedora:35
+RUN dnf -y upgrade
 RUN dnf -y install \
        gcc \
        make \

diff --git a/misc/docker/fedora-31-amd64/Dockerfile b/misc/docker/fedora-36-amd64/Dockerfile
similarity index 86%
rename from misc/docker/fedora-31-amd64/Dockerfile
rename to misc/docker/fedora-36-amd64/Dockerfile
index 9f7ad0cd717444cc6b772803c767116a576e947d..cb84e3c735291b43a40d56f0bb6f54fc18d060f1 100644 (file)
--- a/misc/docker/fedora-31-amd64/Dockerfile
+++ b/misc/docker/fedora-36-amd64/Dockerfile
@@ -1,5 +1,5 @@
-FROM fedora:31
-RUN dnf -y update
+FROM fedora:36
+RUN dnf -y upgrade
 RUN dnf -y install \
        gcc \
        make \

diff --git a/misc/docker/centos-7-amd64/Dockerfile b/misc/docker/fedora-37-amd64/Dockerfile
similarity index 61%
rename from misc/docker/centos-7-amd64/Dockerfile
rename to misc/docker/fedora-37-amd64/Dockerfile
index bef04b00ae8d9707894a247d737f9c6a6286ee36..e6cbd7f5bf713194970b21a9922c645aa6ce2db9 100644 (file)
--- a/misc/docker/centos-7-amd64/Dockerfile
+++ b/misc/docker/fedora-37-amd64/Dockerfile
@@ -1,6 +1,6 @@
-FROM centos:7
-RUN yum -y upgrade
-RUN yum -y install \
+FROM fedora:37
+RUN dnf -y upgrade
+RUN dnf -y install \
        gcc \
        make \
        flex \
@@ -9,10 +9,10 @@ RUN yum -y install \
        libssh-devel \
        ncurses-devel \
        readline-devel
-RUN yum -y install \
+RUN dnf -y install \
        git \
        rpm-build \
-       systemd \
+       systemd-rpm-macros \
        python3 \
        python3-pip \
        python3-setuptools

diff --git a/misc/docker/fedora-38-amd64/Dockerfile b/misc/docker/fedora-38-amd64/Dockerfile
new file mode 100644 (file)
index 0000000..5f889b8
--- /dev/null
+++ b/misc/docker/fedora-38-amd64/Dockerfile
@@ -0,0 +1,18 @@
+FROM fedora:38
+RUN dnf -y upgrade
+RUN dnf -y install \
+       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-39-amd64/Dockerfile b/misc/docker/fedora-39-amd64/Dockerfile
new file mode 100644 (file)
index 0000000..1e0c812
--- /dev/null
+++ b/misc/docker/fedora-39-amd64/Dockerfile
@@ -0,0 +1,18 @@
+FROM fedora:39
+RUN dnf -y upgrade
+RUN dnf -y install \
+       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-40-amd64/Dockerfile b/misc/docker/fedora-40-amd64/Dockerfile
new file mode 100644 (file)
index 0000000..786385f
--- /dev/null
+++ b/misc/docker/fedora-40-amd64/Dockerfile
@@ -0,0 +1,18 @@
+FROM fedora:40
+RUN dnf -y upgrade
+RUN dnf -y install \
+       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-41-amd64/Dockerfile b/misc/docker/fedora-41-amd64/Dockerfile
new file mode 100644 (file)
index 0000000..e3f3a89
--- /dev/null
+++ b/misc/docker/fedora-41-amd64/Dockerfile
@@ -0,0 +1,18 @@
+FROM fedora:41
+RUN dnf -y upgrade
+RUN dnf -y install \
+       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/ubuntu-21.04-amd64/Dockerfile b/misc/docker/ubuntu-22.04-amd64/Dockerfile
similarity index 82%
rename from misc/docker/ubuntu-21.04-amd64/Dockerfile
rename to misc/docker/ubuntu-22.04-amd64/Dockerfile
index 1c32727b1e969ac17462308eca9c9c76c1960ae9..00c4ffec41a4c36e66b77499bfe81ca83a33b63a 100644 (file)
--- a/misc/docker/ubuntu-21.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-22.04-amd64/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:21.04
+# 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 install \

diff --git a/misc/docker/ubuntu-24.04-amd64/Dockerfile b/misc/docker/ubuntu-24.04-amd64/Dockerfile
new file mode 100644 (file)
index 0000000..b6567eb
--- /dev/null
+++ b/misc/docker/ubuntu-24.04-amd64/Dockerfile
@@ -0,0 +1,27 @@
+# bump this to refresh the image: 1
+FROM ubuntu:24.04
+ENV DEBIAN_FRONTEND=noninteractive
+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 --git a/misc/docker/ubuntu-24.10-amd64/Dockerfile b/misc/docker/ubuntu-24.10-amd64/Dockerfile
new file mode 100644 (file)
index 0000000..b886ec6
--- /dev/null
+++ b/misc/docker/ubuntu-24.10-amd64/Dockerfile
@@ -0,0 +1,27 @@
+# bump this to refresh the image: 1
+FROM ubuntu:24.10
+ENV DEBIAN_FRONTEND=noninteractive
+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