Merge 2/2: all docker changes from jb_distr_list2.

diff --git a/misc/docker/centos-7-amd64/Dockerfile b/misc/docker/centos-7-amd64/Dockerfile
index eab1243f543d6a1e18db118c5baa4ad1f1f0bda2..83a813a5f0ee8b362dad0755147e3965f7f1c35b 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.

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 d5c2b1711d0cb4d090874c36421dc8860a16c896..cdee03f999b08e6a106149d72aa4ba10e3e1372e 100644 (file)
--- a/misc/docker/debian-12-amd64/Dockerfile
+++ b/misc/docker/debian-12-amd64/Dockerfile
@@ -1,7 +1,6 @@
 # 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 \
@@ -21,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 a2f5af4d35825110636cb55ca14c4328a11f1d9b..906f9fa5c9d406f3dd16e58547db52049c596a87 100644 (file)
--- a/misc/docker/debian-12-i386/Dockerfile
+++ b/misc/docker/debian-12-i386/Dockerfile
@@ -1,8 +1,8 @@
 # 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 update
+RUN apt-get -y upgrade
 RUN apt-get -y --no-install-recommends install \
        build-essential \
        flex \
@@ -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-testing-amd64/Dockerfile b/misc/docker/debian-testing-amd64/Dockerfile
index e377cf32142f2e5502f10b84a0681e9b54db4152..648ebf14faaa5a039e1f92cdf3c9b585af5ffe89 100644 (file)
--- a/misc/docker/debian-testing-amd64/Dockerfile
+++ b/misc/docker/debian-testing-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM debian:testing-slim
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y update

diff --git a/misc/docker/debian-testing-i386/Dockerfile b/misc/docker/debian-testing-i386/Dockerfile
index 1c16c0fa05f0370fc564b65733f804aff1a56ffd..d658e9c79e83cf0e6e03b3aa3a0ca665d9bb3f55 100644 (file)
--- a/misc/docker/debian-testing-i386/Dockerfile
+++ b/misc/docker/debian-testing-i386/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM i386/debian:testing-slim
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y update

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 fe57f9747fa94a7fbd9894aaf4751cfde17df46a..ff728bd1a8824232c7559674be14639f22bab2d9 100644 (file)
--- a/misc/docker/fedora-35-amd64/Dockerfile
+++ b/misc/docker/fedora-35-amd64/Dockerfile
@@ -1,15 +1,13 @@
+# bump number for image rebuild: 0
 FROM fedora:35
 RUN dnf -y upgrade
-#RUN dnf -y update
 RUN dnf -y install \
        gcc \
        make \
        flex \
        bison \
        autoconf \
-       # pkgconfig \
-       # 'readline-devel' \
-       # 'pkgconfig(ncurses)' \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-36-amd64/Dockerfile b/misc/docker/fedora-36-amd64/Dockerfile
index 9f5296c3e96f397ac2a049af44dd23521949c5d3..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,9 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
-       # pkgconfig \
-       # 'readline-devel' \
-       # 'pkgconfig(ncurses)' \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-37-amd64/Dockerfile b/misc/docker/fedora-37-amd64/Dockerfile
index f7317875dfe18658a6700bc8f1a767b733fa3c3f..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,9 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
-       # pkgconfig \
-       # 'readline-devel' \
-       # 'pkgconfig(ncurses)' \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-38-amd64/Dockerfile b/misc/docker/fedora-38-amd64/Dockerfile
index 877f6496e8bf43dfba4cc8d23101be1f952b8294..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,9 +7,7 @@ RUN dnf -y install \
        flex \
        bison \
        autoconf \
-       # pkgconfig \
-       # 'readline-devel' \
-       # 'pkgconfig(ncurses)' \
+       pkgconfig \
        libssh-devel \
        ncurses-devel \
        readline-devel

diff --git a/misc/docker/fedora-39-amd64/Dockerfile b/misc/docker/fedora-39-amd64/Dockerfile
index be5faa82f6d27afb8df73ba861d21d0e37976ec7..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 \
@@ -5,10 +6,8 @@ RUN dnf -y install \
        make \
        flex \
        bison \
-       # pkgconfig \
-       # 'readline-devel' \
-       # 'pkgconfig(ncurses)' \
        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 a8f6952fcf866604da342d07645fee1c6c05b636..ab2c532ea5008107667945fd65b4d86793920263 100644 (file)
--- a/misc/docker/fedora-40-amd64/Dockerfile
+++ b/misc/docker/fedora-40-amd64/Dockerfile
@@ -1,12 +1,13 @@
+# bump number for image rebuild: 0
 FROM fedora:40
 RUN dnf -y upgrade
-#RUN dnf -y update
 RUN dnf -y install \
        gcc \
        make \
        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/fedora-42-amd64/Dockerfile b/misc/docker/fedora-42-amd64/Dockerfile
index 3b6acac9b69775a37a17a5b3b1d99a4de0280953..bc8ac5c0521dc94e2f8ec86feb3126cd4f6b4b41 100644 (file)
--- a/misc/docker/fedora-42-amd64/Dockerfile
+++ b/misc/docker/fedora-42-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM fedora:42
 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/opensuse-15.4-amd640/Dockerfile b/misc/docker/opensuse-15.4-amd640/Dockerfile
index bfdf28f5757e1ebf0a61f4871c6e40ecabd27ad6..3af34e4d1ce35f4d2857e108e4095b1da8186fad 100644 (file)
--- a/misc/docker/opensuse-15.4-amd640/Dockerfile
+++ b/misc/docker/opensuse-15.4-amd640/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 1
 FROM opensuse/leap:15.4
 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.5-amd64/Dockerfile b/misc/docker/opensuse-15.5-amd64/Dockerfile
index 45a0169499dd008b78f5935d5e9c4c68877c61af..a3aad6c0b08bd9241ffe16ffd354621c4cbb12fa 100644 (file)
--- a/misc/docker/opensuse-15.5-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.5-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 0
 FROM opensuse/leap:15.5
 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-16.04-amd64/Dockerfile b/misc/docker/ubuntu-16.04-amd64/Dockerfile
index c27aef150251ebc2d73018096585f2632a9da7b4..deb1f44a62a8f2a11a11feb96d225c1c08964919 100644 (file)
--- a/misc/docker/ubuntu-16.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-16.04-amd64/Dockerfile
@@ -1,12 +1,30 @@
+# bump number for image rebuild: 0
 FROM ubuntu:16.04
 ENV DEBIAN_FRONTEND noninteractive
 RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
+       tzdata \
        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 \
+       apt-utils \
+       quilt \
+       python3 \
+       python3-pip \
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/ubuntu-18.04-amd64/Dockerfile b/misc/docker/ubuntu-18.04-amd64/Dockerfile
index a1d95317503c9e6f16d553e061ce1cc44b891c1f..2bcddd4efafa748dd58de2346f89a62973d48fc3 100644 (file)
--- a/misc/docker/ubuntu-18.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-18.04-amd64/Dockerfile
@@ -1,9 +1,11 @@
+# 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 +18,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 +26,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..da1e6cdfedf830913092793c8b6552a7ec439415 100644 (file)
--- a/misc/docker/ubuntu-20.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-20.04-amd64/Dockerfile
@@ -1,9 +1,11 @@
+# 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 +18,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 +26,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/ubuntu-20.10-amd64/Dockerfile b/misc/docker/ubuntu-20.10-amd64/Dockerfile
index 19cb1b858e0fed09f3a5541125bd8c5250f612dd..ea0721bc732c6b7c1b42d44c09fdefb50ff968cd 100644 (file)
--- a/misc/docker/ubuntu-20.10-amd64/Dockerfile
+++ b/misc/docker/ubuntu-20.10-amd64/Dockerfile
@@ -1,9 +1,11 @@
+# bump number for image rebuild: 0
 FROM ubuntu:20.10
 ENV DEBIAN_FRONTEND=noninteractive
 RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
+       tzdata \
        build-essential \
        flex \
        bison \
@@ -16,7 +18,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 +26,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/ubuntu-24.04-amd64/Dockerfile b/misc/docker/ubuntu-21.04-amd64 /Dockerfile
similarity index 62%
rename from misc/docker/ubuntu-24.04-amd64/Dockerfile
rename to misc/docker/ubuntu-21.04-amd64 /Dockerfile
index 7997700151d377e43b998e1e2d10a286823daa56..c904d0eed0443b1f94289689e92a4f0006c58969 100644 (file)
--- a/misc/docker/ubuntu-24.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-21.04-amd64 /Dockerfile
@@ -1,9 +1,11 @@
-# bump this to refresh the image: 1
-FROM ubuntu:24.04
+# bump number for image rebuild: 1
+FROM ubuntu:21.04
 ENV DEBIAN_FRONTEND=noninteractive
+RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
+       tzdata \
        build-essential \
        flex \
        bison \
@@ -16,7 +18,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-21.10-amd64 /Dockerfile
similarity index 62%
rename from misc/docker/ubuntu-24.10-amd64/Dockerfile
rename to misc/docker/ubuntu-21.10-amd64 /Dockerfile
index 03a3821b1d84037dcf8b8b110b2bc41abedcf497..2a4f386106c45fa1a6da4ad4e289fb9018158ab7 100644 (file)
--- a/misc/docker/ubuntu-24.10-amd64/Dockerfile
+++ b/misc/docker/ubuntu-21.10-amd64 /Dockerfile
@@ -1,9 +1,11 @@
-# bump this to refresh the image: 1
-FROM ubuntu:24.10
+# bump number for image rebuild: 0
+FROM ubuntu:21.10
 ENV DEBIAN_FRONTEND=noninteractive
+RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get -y install \
+RUN apt-get -y --no-install-recommends install \
+       tzdata \
        build-essential \
        flex \
        bison \
@@ -16,7 +18,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-22.04-amd64/Dockerfile b/misc/docker/ubuntu-22.04-amd64/Dockerfile
index 86ffc34d17ae41ace7010d08ee9408195109e9c2..67ee6ddc44ba3c9c5e25021dd997118e039ee290 100644 (file)
--- a/misc/docker/ubuntu-22.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-22.04-amd64/Dockerfile
@@ -1,9 +1,9 @@
+# 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 \
 RUN apt-get -y --no-install-recommends install \
        tzdata \
        build-essential \
@@ -18,7 +18,7 @@ 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 \

diff --git a/misc/docker/ubuntu-22.10-amd64/Dockerfile b/misc/docker/ubuntu-22.10-amd64/Dockerfile
index f796df8ac052b1939f81ef5c96c4b61b648c99b7..f1c4c5a299065a124705f257c7e0a22d75fbad73 100644 (file)
--- a/misc/docker/ubuntu-22.10-amd64/Dockerfile
+++ b/misc/docker/ubuntu-22.10-amd64/Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 1
 FROM ubuntu:22.10
 ENV DEBIAN_FRONTEND=noninteractive
 RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
@@ -17,7 +18,7 @@ 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 \
@@ -25,4 +26,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/ubuntu-23.04-amd64 /Dockerfile b/misc/docker/ubuntu-23.04-amd64 /Dockerfile
index f5a627973cab1a4df06f2ad6b40b197129c638d9..8c573eb3d296ccc0b5c7ae3902bd3ff7685a0eb9 100644 (file)
--- a/misc/docker/ubuntu-23.04-amd64 /Dockerfile
+++ b/misc/docker/ubuntu-23.04-amd64 /Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 1
 FROM ubuntu:23.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
@@ -17,7 +18,7 @@ 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 \
@@ -25,4 +26,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/ubuntu-23.10-amd64 /Dockerfile b/misc/docker/ubuntu-23.10-amd64 /Dockerfile
index 798bd401f5b9a97a496ebdcb7e0d40ee363a20bb..dd39e1b5c36e60ff01ff0c7c26c9c6c474ee530d 100644 (file)
--- a/misc/docker/ubuntu-23.10-amd64 /Dockerfile
+++ b/misc/docker/ubuntu-23.10-amd64 /Dockerfile
@@ -1,3 +1,4 @@
+# bump number for image rebuild: 1
 FROM ubuntu:23.10
 ENV DEBIAN_FRONTEND=noninteractive
 RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
@@ -17,7 +18,7 @@ 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 \
@@ -25,4 +26,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/ubuntu-24.04-amd64  /Dockerfile b/misc/docker/ubuntu-24.04-amd64  /Dockerfile
index 521a4c6249ed51eee0f4bf70ee8fa6297e026586..6ea1de7ebc78f8f600aff418b7d269fdc154774d 100644 (file)
--- a/misc/docker/ubuntu-24.04-amd64  /Dockerfile
+++ b/misc/docker/ubuntu-24.04-amd64  /Dockerfile
@@ -1,3 +1,4 @@
+# bump this to refresh the image: 1
 FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
@@ -17,7 +18,7 @@ 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 \
@@ -25,4 +26,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv

diff --git a/misc/docker/ubuntu-24.10-amd64  /Dockerfile b/misc/docker/ubuntu-24.10-amd64  /Dockerfile
index eac14f5f90f5dd17ff7a73f72d475516c9593f34..d804ee79893cddc46cfb98a93ddbb1bf67356f8c 100644 (file)
--- a/misc/docker/ubuntu-24.10-amd64  /Dockerfile
+++ b/misc/docker/ubuntu-24.10-amd64  /Dockerfile
@@ -1,3 +1,4 @@
+# bump this to refresh the image: 1
 FROM ubuntu:24.10
 ENV DEBIAN_FRONTEND=noninteractive
 RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
@@ -17,7 +18,7 @@ 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 \
@@ -25,4 +26,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv