CI: Massive update of build and test runners

Fixed and added current distros, deleted certain EOL distros,
sorted things in the CI file.

With some heavy lifting and comments by Maria.

Signed-Off-By: Maria Matejka <mq@jmq.cz>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c35f7df56ff385dacb2b26e24283bd996cfc698..25cb9fc50843c361976478b0ab6208d45ec21bce 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,8 @@
+## TODO: find out how to generate this file by another yaml file.
+## Gitlab can do it but it is a stupid idea to mess with this
+## when releasing 4 versions at once. See ya later!
+##                                              -- Maria, April 2025
+
 variables:
   DEBIAN_FRONTEND: noninteractive
   LC_ALL: C.UTF-8
@@ -14,6 +19,12 @@ stages:
   - test
   - release
 
+## Docker Image Rules
+#
+# We are running all the build / packaging tests in Dockers (unless otherwise)
+# and these are rules to build these docker images. These are expensive to run
+# and should run only if needed.
+
 .docker: &docker_build
   stage: image
   script:
@@ -47,14 +58,14 @@ docker-docbuilder:
     IMG_NAME: "docbuilder"
   <<: *docker_build
 
-docker-debian-9-amd64:
+docker-centos-7-amd64:
   variables:
-    IMG_NAME: "debian-9-amd64"
+    IMG_NAME: "centos-7-amd64"
   <<: *docker_build
 
-docker-debian-9-i386:
+docker-centos-8-amd64:
   variables:
-    IMG_NAME: "debian-9-i386"
+    IMG_NAME: "centos-8-amd64"
   <<: *docker_build
 
 docker-debian-10-amd64:
@@ -147,66 +158,71 @@ docker-fedora-41-amd64:
     IMG_NAME: "fedora-41-amd64"
   <<: *docker_build
 
-docker-centos-7-amd64:
-  variables:
-    IMG_NAME: "centos-7-amd64"
-  <<: *docker_build
+#planned release 4/2025
+# docker-fedora-42-amd64:
+#   variables:
+#     IMG_NAME: "fedora-42-amd64"
+#   <<: *docker_build
 
-docker-centos-8-amd64:
+docker-opensuse-15.0-amd64:
   variables:
-    IMG_NAME: "centos-8-amd64"
+    IMG_NAME: "opensuse-15.0-amd64"
   <<: *docker_build
 
-docker-ubuntu-16_04-amd64:
+docker-opensuse-15.1-amd64:
   variables:
-    IMG_NAME: "ubuntu-16.04-amd64"
+    IMG_NAME: "opensuse-15.1-amd64"
   <<: *docker_build
 
-docker-ubuntu-18_04-amd64:
+docker-opensuse-15.2-amd64:
   variables:
-    IMG_NAME: "ubuntu-18.04-amd64"
+    IMG_NAME: "opensuse-15.2-amd64"
   <<: *docker_build
 
-docker-ubuntu-20_04-amd64:
+docker-opensuse-15.3-amd64:
   variables:
-    IMG_NAME: "ubuntu-20.04-amd64"
+    IMG_NAME: "opensuse-15.3-amd64"
   <<: *docker_build
 
-docker-ubuntu-22_04-amd64:
+docker-opensuse-15.4-amd64:
   variables:
-    IMG_NAME: "ubuntu-22.04-amd64"
+    IMG_NAME: "opensuse-15.4-amd64"
   <<: *docker_build
 
-docker-ubuntu-24_04-amd64:
+docker-opensuse-15.5-amd64:
   variables:
-    IMG_NAME: "ubuntu-24.04-amd64"
+    IMG_NAME: "opensuse-15.5-amd64"
   <<: *docker_build
 
-docker-ubuntu-24_10-amd64:
+docker-ubuntu-18_04-amd64:
   variables:
-    IMG_NAME: "ubuntu-24.10-amd64"
+    IMG_NAME: "ubuntu-18.04-amd64"
   <<: *docker_build
 
-docker-opensuse-15.0-amd64:
+docker-ubuntu-20_04-amd64:
   variables:
-    IMG_NAME: "opensuse-15.0-amd64"
+    IMG_NAME: "ubuntu-20.04-amd64"
   <<: *docker_build
 
-docker-opensuse-15.1-amd64:
+docker-ubuntu-22_04-amd64:
   variables:
-    IMG_NAME: "opensuse-15.1-amd64"
+    IMG_NAME: "ubuntu-22.04-amd64"
   <<: *docker_build
 
-docker-opensuse-15.2-amd64:
+docker-ubuntu-24_04-amd64:
   variables:
-    IMG_NAME: "opensuse-15.2-amd64"
+    IMG_NAME: "ubuntu-24.04-amd64"
   <<: *docker_build
 
-docker-opensuse-15.3-amd64:
+docker-ubuntu-24_10-amd64:
   variables:
-    IMG_NAME: "opensuse-15.3-amd64"
+    IMG_NAME: "ubuntu-24.10-amd64"
   <<: *docker_build
 
+## Build stage
+#
+# Now we compile and run unit tests ... in every single distribution.
+# Every task needs its docker, see above.
 
 .build: &build-base
   stage: build
@@ -221,6 +237,7 @@ docker-opensuse-15.3-amd64:
   # Build docs when tools are available
   - if which linuxdoc pdflatex sgmlsasp >/dev/null ; then $MAKE docs ; fi
 
+# A special task for preparing the release archives
 build-release:
   image: registry.nic.cz/labs/bird:docbuilder
   stage: build
@@ -233,7 +250,7 @@ build-release:
     - make obj/doc/bird-singlepage.html
     - BRANCH=$CI_COMMIT_BRANCH tools/make-archive
   artifacts:
-    paths: 
+    paths:
       - obj/doc/bird-singlepage.html
       - bird-*.tar.gz
     expire_in: 1 day
@@ -245,13 +262,17 @@ build-release:
     - linux
     - amd64
 
-build-debian-9-amd64:
+build-centos-7-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:debian-9-amd64
+  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-debian-9-i386:
+build-centos-8-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:debian-9-i386
+  image: registry.nic.cz/labs/bird:centos-8-amd64
 
 build-debian-10-amd64:
   <<: *build-linux
@@ -325,21 +346,34 @@ build-fedora-41-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:fedora-41-amd64
 
-build-centos-7-amd64:
+#planned release 4/2025
+# build-fedora-42-amd64:
+#   <<: *build-linux
+#   image: registry.nic.cz/labs/bird:fedora-42-amd64
+
+build-opensuse-15.0-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
+  image: registry.nic.cz/labs/bird:opensuse-15.0-amd64
 
-build-centos-8-amd64:
+build-opensuse-15.1-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:centos-8-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
+
+build-opensuse-15.2-amd64:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
+
+build-opensuse-15.3-amd64:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
+
+build-opensuse-15.4-amd64:
+  <<: *build-linux
+  image: registry.nic.cz/labs/bird:opensuse-15.4-amd64
 
-build-ubuntu-16_04-amd64:
+build-opensuse-15.5-amd64:
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:ubuntu-16.04-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.5-amd64
 
 build-ubuntu-18_04-amd64:
   <<: *build-linux
@@ -361,38 +395,11 @@ build-ubuntu-24_10-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64
 
-build-opensuse-15.0-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:opensuse-15.0-amd64
-
-build-opensuse-15.1-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
-
-build-opensuse-15.2-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
-
-build-opensuse-15.3-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
-
-#build-freebsd-11-amd64:
-#  <<: *build-base
-#  tags:
-#    - freebsd
-#    - amd64
-
-#build-freebsd-11-i386:
-#  <<: *build-base
-#  tags:
-#    - freebsd
-#    - i386
-
+# Testing builds for just a single protocol each time
 
 .build-only: &build-only
   <<: *build-linux
-  image: registry.nic.cz/labs/bird:debian-11-amd64
+  image: registry.nic.cz/labs/bird:debian-12-amd64
 
 build-only-aggregator:
   <<: *build-only
@@ -459,6 +466,12 @@ build-only-static:
   variables:
     CONFIGURE_OPTIONS: --with-protocols=static
 
+# Packaging rules
+# As we support some ancient versions of different distributions,
+# we need to keep several different machineries. It's not so bad
+# but it's bad nevertheless.
+#
+# We do NOT build separate documentation packages in these rules.
 
 .pkg-deb: &pkg-deb
   stage: pkg
@@ -478,7 +491,9 @@ build-only-static:
     # create venv only if it's installed
     - if python3 -m venv venv; then . venv/bin/activate; fi
     # install older version of bs4 that does not use python version >= 3.6
-    - pip3 install beautifulsoup4==4.11.2 
+    # apkg depends on bs4, and unless we want to backport python 3.6
+    # to ancient distros, we need to do this workaround
+    - pip3 install beautifulsoup4==4.11.2
     - pip3 install apkg
     - BRANCH=$CI_COMMIT_BRANCH ARCHIVE_DOCS=false apkg build
     #- apkg install -y pkg/pkgs/*/*/*.deb
@@ -509,6 +524,20 @@ build-only-static:
     paths:
       - pkg/pkgs/*
 
+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
+
+pkg-centos-8-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-centos-8-amd64]
+  image: registry.nic.cz/labs/bird:centos-8-amd64
+
 pkg-debian-10-amd64:
   <<: *pkg-deb
   needs: [build-debian-10-amd64]
@@ -539,6 +568,16 @@ pkg-debian-12-i386:
   needs: [build-debian-12-i386]
   image: registry.nic.cz/labs/bird:debian-12-i386
 
+pkg-debian-testing-amd64:
+  <<: *pkg-deb
+  needs: [build-debian-testing-amd64]
+  image: registry.nic.cz/labs/bird:debian-testing-amd64
+
+pkg-debian-testing-i386:
+  <<: *pkg-deb
+  needs: [build-debian-testing-i386]
+  image: registry.nic.cz/labs/bird:debian-testing-i386
+
 pkg-fedora-32-amd64:
   <<: *pkg-rpm-wa
   needs: [build-fedora-32-amd64]
@@ -589,19 +628,41 @@ pkg-fedora-41-amd64:
   needs: [build-fedora-41-amd64]
   image: registry.nic.cz/labs/bird:fedora-41-amd64
 
-pkg-centos-7-amd64:
+#planned release 4/2025
+# pkg-fedora-42-amd64:
+#   <<: *pkg-rpm
+#   needs: [build-fedora-42-amd64]
+#   image: registry.nic.cz/labs/bird:fedora-42-amd64
+
+pkg-opensuse-15.0-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-opensuse-15.0-amd64]
+ image: registry.nic.cz/labs/bird:opensuse-15.0-amd64
+
+pkg-opensuse-15.1-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-opensuse-15.1-amd64]
+ image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
+
+pkg-opensuse-15.2-amd64:
+ <<: *pkg-rpm-wa
+ needs: [build-opensuse-15.2-amd64]
+ image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
+
+pkg-opensuse-15.3-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
+  needs: [build-opensuse-15.3-amd64]
+  image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
 
-pkg-centos-8-amd64:
+pkg-opensuse-15.4-amd64:
   <<: *pkg-rpm-wa
-  needs: [build-centos-8-amd64]
-  image: registry.nic.cz/labs/bird:centos-8-amd64
+  needs: [build-opensuse-15.4-amd64]
+  image: registry.nic.cz/labs/bird:opensuse-15.4-amd64
+
+pkg-opensuse-15.5-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-opensuse-15.5-amd64]
+  image: registry.nic.cz/labs/bird:opensuse-15.5-amd64
 
 pkg-ubuntu-18.04-amd64:
   <<: *pkg-deb-legacy
@@ -628,40 +689,21 @@ pkg-ubuntu-24.10-amd64:
   needs: [build-ubuntu-24_10-amd64]
   image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64
 
-pkg-opensuse-15.1-amd64:
-  <<: *pkg-rpm-wa
-  needs: [build-opensuse-15.1-amd64]
-  image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
-
-pkg-opensuse-15.2-amd64:
-  <<: *pkg-rpm-wa
-  needs: [build-opensuse-15.2-amd64]
-  image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
-
-pkg-opensuse-15.3-amd64:
-  <<: *pkg-rpm-wa
-  needs: [build-opensuse-15.3-amd64]
-  image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
-
-
 build-netlab:
   stage: build
-  variables:
-    BDIR: build-netlab
   tags:
     - netlab
     - amd64
   script:
+    - DIR=$(pwd)
     - autoreconf
-    - mkdir $BDIR
-    - cd $BDIR
-    - ../configure
+    - ./configure
     - BRANCH=$CI_COMMIT_BRANCH make
-  artifacts:
-    paths:
-      - $BDIR/bird
-      - $BDIR/birdc
-    expire_in: 2 hours
+    - cd $TOOLS_DIR
+    - sudo git clean -fx
+    - git pull --ff-only
+    - mv $DIR/bird $DIR/birdc netlab/common
+    - ln -s $STAYRTR_BINARY netlab/common/stayrtr
 
 .test: &test-base
   stage: test
@@ -670,13 +712,7 @@ build-netlab:
     - netlab
     - amd64
   script:
-    - DIR=$(pwd)
-    - cd $TOOLS_DIR
-    - sudo git clean -fx
-    - git pull --ff-only
-    - mv $DIR/build-netlab/* netlab/common/
-    - ln -s $STAYRTR_BINARY netlab/common/stayrtr
-    - cd netlab
+    - cd $TOOLS_DIR/netlab
     - sudo ./stop
     - sudo ./runtest -s v2 -m check $TEST_NAME
 
@@ -849,24 +885,7 @@ test-mpls-bgp-l3vpn:
     - gmake
     - gmake check
 
-build-birdlab-debian-11:
-  <<: *build-birdlab-base
-  tags:
-    - birdlab-debian-11
-    - amd64
-
-build-birdlab-centos-08:
-  <<: *build-birdlab-base
-  tags:
-    - birdlab-centos-08
-    - amd64
-
-build-birdlab-fedora-37:
-  <<: *build-birdlab-base
-  tags:
-    - birdlab-fedora-37
-    - amd64
-
+# There is no docker for BSD's, these are proper virtuals in QEMU.
 build-birdlab-freebsd-13:
   <<: *build-birdlab-base
   tags:
@@ -881,7 +900,33 @@ build-birdlab-openbsd-71:
     - birdlab-openbsd-71
     - amd64
 
-confirm-release:
+# We have also some virtuals for these but there are working dockers as well
+# so no need to bother again
+#build-birdlab-debian-11:
+#  <<: *build-birdlab-base
+#  tags:
+#    - birdlab-debian-11
+#    - amd64
+#
+#build-birdlab-centos-08:
+#  <<: *build-birdlab-base
+#  tags:
+#    - birdlab-centos-08
+#    - amd64
+#
+#build-birdlab-fedora-37:
+#  <<: *build-birdlab-base
+#  tags:
+#    - birdlab-fedora-37
+#    - amd64
+
+# Release confirmation job for tag pushing. As soon as we finish our web
+# deployment automatic machinery, clicking the button is expected to
+# publish the release info on our website.
+#
+# We are not there yet tho, too many other fish to fry.
+
+publish-release:
   stage: release
   script:
   - "true"

diff --git a/misc/docker/centos-7-amd64/Dockerfile b/misc/docker/centos-7-amd64/Dockerfile
index eab1243f543d6a1e18db118c5baa4ad1f1f0bda2..0efed416705282e80236a194eae61343dcdd2187 100644 (file)
--- a/misc/docker/centos-7-amd64/Dockerfile
+++ b/misc/docker/centos-7-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM centos:7
 
 # Has to be done for yum to work properly. CentOS 7 is EOL.
@@ -5,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 \
@@ -41,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/centos-8-amd64/Dockerfile b/misc/docker/centos-8-amd64/Dockerfile
index 4402fd5c7df574b4cb1a956813fd5b883c5f5e86..667d99e597b363ccb8f7c84e21114345055a7f90 100644 (file)
--- a/misc/docker/centos-8-amd64/Dockerfile
+++ b/misc/docker/centos-8-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM centos:8
 
 # Has to be done for yum to work properly. CentOS 8 is EOL.

diff --git a/misc/docker/debian-10-amd64/Dockerfile b/misc/docker/debian-10-amd64/Dockerfile
index 29034a8426ed003d37012ac7a7d0c7cd57d9da22..1e281a0d1c2c6755ac7283e78158e39ff4948f52 100644 (file)
--- a/misc/docker/debian-10-amd64/Dockerfile
+++ b/misc/docker/debian-10-amd64/Dockerfile
@@ -1,5 +1,6 @@
+# bump number for image rebuild: 0
 FROM debian:buster-slim
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
@@ -22,4 +23,5 @@ RUN apt-get -y --no-install-recommends install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/debian-10-i386/Dockerfile b/misc/docker/debian-10-i386/Dockerfile
index 99570ffc5deb77fc9ae61a4ff2d88ce851e727f4..e3c164e8c522da7213196f71b51fdc9b070cbe55 100644 (file)
--- a/misc/docker/debian-10-i386/Dockerfile
+++ b/misc/docker/debian-10-i386/Dockerfile
@@ -1,5 +1,6 @@
+# bump number for image rebuild: 0
 FROM i386/debian:buster-slim
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
@@ -19,7 +20,9 @@ RUN apt-get -y --no-install-recommends install \
        git \
        dpkg-dev \
        debhelper \
+       apt-utils \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/debian-11-amd64/Dockerfile b/misc/docker/debian-11-amd64/Dockerfile
index 245c842cfc712af6b704507c5894a553069b0ee6..94f2a54de7842111624302b03440db9159bebd06 100644 (file)
--- a/misc/docker/debian-11-amd64/Dockerfile
+++ b/misc/docker/debian-11-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM amd64/debian:bullseye-slim
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update
@@ -19,7 +20,9 @@ RUN apt-get -y --no-install-recommends install \
        git \
        dpkg-dev \
        debhelper \
+       apt-utils \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/debian-11-i386/Dockerfile b/misc/docker/debian-11-i386/Dockerfile
index 1edb4579cef64d7cfba1f8221d8d247f80168ece..1fcbc37d7f26cffcefaf5bd73f21227c6c3d1545 100644 (file)
--- a/misc/docker/debian-11-i386/Dockerfile
+++ b/misc/docker/debian-11-i386/Dockerfile
@@ -1,7 +1,8 @@
 # bump number for image rebuild: 1
 FROM i386/debian:bullseye-slim
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get -y update && apt-get -y upgrade
+RUN apt-get -y update
+RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
        build-essential \
        flex \
@@ -19,7 +20,9 @@ RUN apt-get -y --no-install-recommends install \
        git \
        dpkg-dev \
        debhelper \
+       apt-utils \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/debian-12-amd64/Dockerfile b/misc/docker/debian-12-amd64/Dockerfile
index 9a3ab9f43aa41d98011baf35bc3a6665d6735250..cdee03f999b08e6a106149d72aa4ba10e3e1372e 100644 (file)
--- a/misc/docker/debian-12-amd64/Dockerfile
+++ b/misc/docker/debian-12-amd64/Dockerfile
@@ -20,6 +20,7 @@ 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
index a324f9efa0a2771f7cb61ac1b2b4a40a76a90d88..906f9fa5c9d406f3dd16e58547db52049c596a87 100644 (file)
--- a/misc/docker/debian-12-i386/Dockerfile
+++ b/misc/docker/debian-12-i386/Dockerfile
@@ -1,7 +1,8 @@
 # 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 update
+RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
        build-essential \
        flex \
@@ -19,6 +20,7 @@ RUN apt-get -y --no-install-recommends install \
        git \
        dpkg-dev \
        debhelper \
+       apt-utils \
        quilt \
        python3 \
        python3-pip \

diff --git a/misc/docker/debian-9-amd64/Dockerfile b/misc/docker/debian-9-amd64/Dockerfile
deleted file mode 100644 (file)
index 010b275..0000000
--- a/misc/docker/debian-9-amd64/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM debian:stretch-slim
-ENV DEBIAN_FRONTEND noninteractive
-
-# Has to be done for apt-get to work properly. Debian 9 is EOL.
-RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list
-RUN sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list 
-RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
-
-RUN apt-get -y update
-RUN 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-9-i386/Dockerfile b/misc/docker/debian-9-i386/Dockerfile
deleted file mode 100644 (file)
index 93d27d2..0000000
--- a/misc/docker/debian-9-i386/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM i386/debian:stretch-slim
-ENV DEBIAN_FRONTEND noninteractive
-
-# Has to be done for apt-get to work properly. Debian 9 is EOL.
-RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list
-RUN sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list 
-RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
-
-RUN apt-get -y update
-RUN 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-testing-amd64/Dockerfile b/misc/docker/debian-testing-amd64/Dockerfile
index e377cf32142f2e5502f10b84a0681e9b54db4152..f40e8c4fe3fe743ab895cd6772bd4d98984263ef 100644 (file)
--- a/misc/docker/debian-testing-amd64/Dockerfile
+++ b/misc/docker/debian-testing-amd64/Dockerfile
@@ -1,11 +1,28 @@
+# bump number for image rebuild: 0
 FROM debian:testing-slim
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
        build-essential \
        flex \
        bison \
        autoconf \
        ncurses-dev \
-       libreadline-dev
+       libreadline-dev \
+       libssh-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/debian-testing-i386/Dockerfile b/misc/docker/debian-testing-i386/Dockerfile
index 1c16c0fa05f0370fc564b65733f804aff1a56ffd..866738d61fc9ffe9c228a8e468ac1acb7f264909 100644 (file)
--- a/misc/docker/debian-testing-i386/Dockerfile
+++ b/misc/docker/debian-testing-i386/Dockerfile
@@ -1,11 +1,28 @@
+# bump number for image rebuild: 0
 FROM i386/debian:testing-slim
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
        build-essential \
        flex \
        bison \
        autoconf \
        ncurses-dev \
-       libreadline-dev
+       libreadline-dev \
+       libssh-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/docbuilder/Dockerfile b/misc/docker/docbuilder/Dockerfile
index 71ab2969aca6fe06224766315a2a04771e276e4c..464ec3030fa7a343eb79eaf85e2b987af3b6bbf1 100644 (file)
--- a/misc/docker/docbuilder/Dockerfile
+++ b/misc/docker/docbuilder/Dockerfile
@@ -1,6 +1,6 @@
 # bump this to recreate the image: 2
 FROM debian:bookworm-slim
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
@@ -10,9 +10,21 @@ RUN apt-get -y --no-install-recommends install \
        autoconf \
        git \
        pandoc \
+       ncurses-dev \
+       libreadline-dev \
+       libssh-gcrypt-dev \
        linuxdoc-tools-latex \
        texlive-latex-extra \
        groff \
        opensp \
        docbook-xsl \
        xsltproc
+RUN apt-get -y --no-install-recommends install \
+       dpkg-dev \
+       debhelper \
+       apt-utils \
+       quilt \
+       python3 \
+       python3-pip \
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/fedora-32-amd64/Dockerfile b/misc/docker/fedora-32-amd64/Dockerfile
index 609dbf33e9fea908965189bddd16501ccd3e7246..bd27593001a35fe3492c590e07e793abb893ffc3 100644 (file)
--- a/misc/docker/fedora-32-amd64/Dockerfile
+++ b/misc/docker/fedora-32-amd64/Dockerfile
@@ -1,11 +1,13 @@
+# bump number for image rebuild: 0
 FROM fedora:32
-RUN dnf -y update
+RUN dnf -y upgrade
 RUN dnf -y install \
        gcc \
        make \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-33-amd64/Dockerfile b/misc/docker/fedora-33-amd64/Dockerfile
index 7e7070687323dcbc8d926655606952719bf7a601..08efe2f8c15623f1eb4342c4c6c12bb05afc9422 100644 (file)
--- a/misc/docker/fedora-33-amd64/Dockerfile
+++ b/misc/docker/fedora-33-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM fedora:33
 RUN dnf -y upgrade
 RUN dnf -y install \
@@ -6,6 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-34-amd64/Dockerfile b/misc/docker/fedora-34-amd64/Dockerfile
index 6bd775296db8c3877f143a5df3fdb69a64d0c908..f39087b7e2f09a6955bf593f140cd10063dd02dd 100644 (file)
--- a/misc/docker/fedora-34-amd64/Dockerfile
+++ b/misc/docker/fedora-34-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM fedora:34
 RUN dnf -y upgrade
 RUN dnf -y install \
@@ -6,6 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-35-amd64/Dockerfile b/misc/docker/fedora-35-amd64/Dockerfile
index dee5d2469e0ec6046f47ecc40746b00954b47516..ff728bd1a8824232c7559674be14639f22bab2d9 100644 (file)
--- a/misc/docker/fedora-35-amd64/Dockerfile
+++ b/misc/docker/fedora-35-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM fedora:35
 RUN dnf -y upgrade
 RUN dnf -y install \
@@ -6,6 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-36-amd64/Dockerfile b/misc/docker/fedora-36-amd64/Dockerfile
index cb84e3c735291b43a40d56f0bb6f54fc18d060f1..eb98def6f73d1fe4e1be69fe7147177096cf1ce9 100644 (file)
--- a/misc/docker/fedora-36-amd64/Dockerfile
+++ b/misc/docker/fedora-36-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM fedora:36
 RUN dnf -y upgrade
 RUN dnf -y install \
@@ -6,6 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-37-amd64/Dockerfile b/misc/docker/fedora-37-amd64/Dockerfile
index e6cbd7f5bf713194970b21a9922c645aa6ce2db9..a8003d2240f7c10cb159999b91bebeed2783a23a 100644 (file)
--- a/misc/docker/fedora-37-amd64/Dockerfile
+++ b/misc/docker/fedora-37-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM fedora:37
 RUN dnf -y upgrade
 RUN dnf -y install \
@@ -6,6 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-38-amd64/Dockerfile b/misc/docker/fedora-38-amd64/Dockerfile
index 5f889b84812f0b537aea6136876819e389c2bbea..1ef81e76ab0c21d9f8230cc9e3b9024bee594576 100644 (file)
--- a/misc/docker/fedora-38-amd64/Dockerfile
+++ b/misc/docker/fedora-38-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM fedora:38
 RUN dnf -y upgrade
 RUN dnf -y install \
@@ -6,6 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-39-amd64/Dockerfile b/misc/docker/fedora-39-amd64/Dockerfile
index 1e0c812eceeb99d02864ab8cb54747ba543550dd..e986bf2187e564f82f93efc6ce9929eeda5ce792 100644 (file)
--- a/misc/docker/fedora-39-amd64/Dockerfile
+++ b/misc/docker/fedora-39-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM fedora:39
 RUN dnf -y upgrade
 RUN dnf -y install \
@@ -6,6 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-40-amd64/Dockerfile b/misc/docker/fedora-40-amd64/Dockerfile
index 786385fea150cf6fd0e83da77930562ff7f32979..ab2c532ea5008107667945fd65b4d86793920263 100644 (file)
--- a/misc/docker/fedora-40-amd64/Dockerfile
+++ b/misc/docker/fedora-40-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM fedora:40
 RUN dnf -y upgrade
 RUN dnf -y install \
@@ -6,6 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-41-amd64/Dockerfile b/misc/docker/fedora-41-amd64/Dockerfile
index e3f3a89b5ee323312ace94bd9475913365f0a539..6d9b80d944ddc0b69efb06f9020d09816b1b9518 100644 (file)
--- a/misc/docker/fedora-41-amd64/Dockerfile
+++ b/misc/docker/fedora-41-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM fedora:41
 RUN dnf -y upgrade
 RUN dnf -y install \
@@ -6,6 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/opensuse-15.0-amd64/Dockerfile b/misc/docker/opensuse-15.0-amd64/Dockerfile
index b1faff40921f06603e3bfb586036e2c92e421e05..b0653b37f02f74da97123f6ba8eca46a19f4e186 100644 (file)
--- a/misc/docker/opensuse-15.0-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.0-amd64/Dockerfile
@@ -1,11 +1,21 @@
+# bump number for image rebuild: 0
 FROM opensuse/leap:15.0
 RUN zypper -n up
 RUN zypper -n install \
-       autoconf \
+       gcc \
+       make \
        flex \
        bison \
+       autoconf \
        pkgconfig \
-       readline-devel \
+       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.1-amd64/Dockerfile b/misc/docker/opensuse-15.1-amd64/Dockerfile
index 77a0455d20395a23ff9767f6da31b6c7f566ce8e..a467059ea3aaae8b5cdf75462cef02f560bd31f5 100644 (file)
--- a/misc/docker/opensuse-15.1-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.1-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM opensuse/leap:15.1
 RUN zypper -n up
 RUN zypper -n install \
@@ -6,6 +7,7 @@ RUN zypper -n install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/opensuse-15.2-amd64/Dockerfile b/misc/docker/opensuse-15.2-amd64/Dockerfile
index 44a146db079697a2765c7a0efaf5227f1eb0b3f4..daf48d39fa36d30872ed8146bc297f3883e50d53 100644 (file)
--- a/misc/docker/opensuse-15.2-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.2-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM opensuse/leap:15.2
 RUN zypper -n up
 RUN zypper -n install \
@@ -6,6 +7,7 @@ RUN zypper -n install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/opensuse-15.3-amd64/Dockerfile b/misc/docker/opensuse-15.3-amd64/Dockerfile
index 9fe8f4c2a2db0cb74e57a20e56f1a9932f937f8c..3ba55208057c3b9c8e18bb8f2740bb25eca77792 100644 (file)
--- a/misc/docker/opensuse-15.3-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.3-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM opensuse/leap:15.3
 RUN zypper -n up
 RUN zypper -n install \
@@ -6,6 +7,7 @@ RUN zypper -n install \
        flex \
        bison \
        autoconf \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/ubuntu-14.04-amd64/Dockerfile b/misc/docker/ubuntu-14.04-amd64/Dockerfile
deleted file mode 100644 (file)
index 3532507..0000000
--- a/misc/docker/ubuntu-14.04-amd64/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM ubuntu:14.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 \
-       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
deleted file mode 100644 (file)
index c27aef1..0000000
--- a/misc/docker/ubuntu-16.04-amd64/Dockerfile
+++ /dev/null
@@ -1,12 +0,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 install \
-       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 a1d95317503c9e6f16d553e061ce1cc44b891c1f..92a804378c5f4b930f497d666b21487860eec08f 100644 (file)
--- a/misc/docker/ubuntu-18.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-18.04-amd64/Dockerfile
@@ -1,9 +1,10 @@
+# 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 install \
+RUN apt-get -y --no-install-recommends install \
+       tzdata \
        build-essential \
        flex \
        bison \
@@ -16,7 +17,7 @@ RUN apt-get -y install \
        opensp \
        docbook-xsl \
        xsltproc
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
        git \
        dpkg-dev \
        debhelper \
@@ -24,4 +25,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/ubuntu-20.04-amd64/Dockerfile b/misc/docker/ubuntu-20.04-amd64/Dockerfile
index fac1b3338ca58cd9d690d2d67962f66100ad1b5a..13e411c225822303b2a19ca0c9dfb5da59d3cfe1 100644 (file)
--- a/misc/docker/ubuntu-20.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-20.04-amd64/Dockerfile
@@ -1,9 +1,10 @@
+# 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 install \
+RUN apt-get -y --no-install-recommends install \
+       tzdata \
        build-essential \
        flex \
        bison \
@@ -16,7 +17,7 @@ RUN apt-get -y install \
        opensp \
        docbook-xsl \
        xsltproc
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
        git \
        dpkg-dev \
        debhelper \
@@ -24,4 +25,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/ubuntu-22.04-amd64/Dockerfile b/misc/docker/ubuntu-22.04-amd64/Dockerfile
index 4996fff2a12f916146eae687825d56e9a1347c12..03db8c9499790937fa68d7c14d892ae55f597b3d 100644 (file)
--- a/misc/docker/ubuntu-22.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-22.04-amd64/Dockerfile
@@ -3,7 +3,8 @@ FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
+       tzdata \
        build-essential \
        flex \
        bison \
@@ -16,7 +17,7 @@ RUN apt-get -y install \
        opensp \
        docbook-xsl \
        xsltproc
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
        git \
        dpkg-dev \
        debhelper \

diff --git a/misc/docker/ubuntu-24.04-amd64/Dockerfile b/misc/docker/ubuntu-24.04-amd64/Dockerfile
index 7997700151d377e43b998e1e2d10a286823daa56..c894bb4622411872eda6e5d1ba8632ef4775198b 100644 (file)
--- a/misc/docker/ubuntu-24.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-24.04-amd64/Dockerfile
@@ -3,7 +3,8 @@ FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
+       tzdata \
        build-essential \
        flex \
        bison \
@@ -16,7 +17,7 @@ RUN apt-get -y install \
        opensp \
        docbook-xsl \
        xsltproc
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
        git \
        dpkg-dev \
        debhelper \

diff --git a/misc/docker/ubuntu-24.10-amd64/Dockerfile b/misc/docker/ubuntu-24.10-amd64/Dockerfile
index 03a3821b1d84037dcf8b8b110b2bc41abedcf497..2a01aa9233f8aeb21f466aa96b0ad90adff7dee2 100644 (file)
--- a/misc/docker/ubuntu-24.10-amd64/Dockerfile
+++ b/misc/docker/ubuntu-24.10-amd64/Dockerfile
@@ -3,7 +3,8 @@ FROM ubuntu:24.10
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
+       tzdata \
        build-essential \
        flex \
        bison \
@@ -16,7 +17,7 @@ RUN apt-get -y install \
        opensp \
        docbook-xsl \
        xsltproc
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
        git \
        dpkg-dev \
        debhelper \