From: Jana Babovakova Date: Mon, 31 Mar 2025 15:22:15 +0000 (+0200) Subject: Merge 2/2: all docker changes from jb_distr_list2. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d2aede52335cba4073687b8572410bdacc6a98d;p=thirdparty%2Fbird.git 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 eab1243f5..83a813a5f 100644 --- 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 4402fd5c7..667d99e59 100644 --- 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 29034a842..1e281a0d1 100644 --- 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 99570ffc5..e3c164e8c 100644 --- 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 245c842cf..94f2a54de 100644 --- 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 1edb4579c..1fcbc37d7 100644 --- 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 d5c2b1711..cdee03f99 100644 --- 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 a2f5af4d3..906f9fa5c 100644 --- 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 e377cf321..648ebf14f 100644 --- 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 1c16c0fa0..d658e9c79 100644 --- 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 71ab2969a..464ec3030 100644 --- 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 609dbf33e..bd2759300 100644 --- 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 7e7070687..08efe2f8c 100644 --- 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 6bd775296..f39087b7e 100644 --- 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 fe57f9747..ff728bd1a 100644 --- 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 9f5296c3e..eb98def6f 100644 --- 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 f7317875d..a8003d224 100644 --- 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 877f6496e..1ef81e76a 100644 --- 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 be5faa82f..e986bf218 100644 --- 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 a8f6952fc..ab2c532ea 100644 --- 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 e3f3a89b5..6d9b80d94 100644 --- 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 3b6acac9b..bc8ac5c05 100644 --- 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 b1faff409..b0653b37f 100644 --- 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 77a0455d2..a467059ea 100644 --- 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 44a146db0..daf48d39f 100644 --- 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 9fe8f4c2a..3ba552080 100644 --- 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 bfdf28f57..3af34e4d1 100644 --- 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 45a016949..a3aad6c0b 100644 --- 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 c27aef150..deb1f44a6 100644 --- 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 a1d953175..2bcddd4ef 100644 --- 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 fac1b3338..da1e6cdfe 100644 --- 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 19cb1b858..ea0721bc7 100644 --- 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 799770015..c904d0eed 100644 --- 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 03a3821b1..2a4f38610 100644 --- 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 86ffc34d1..67ee6ddc4 100644 --- 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 f796df8ac..f1c4c5a29 100644 --- 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 f5a627973..8c573eb3d 100644 --- 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 798bd401f..dd39e1b5c 100644 --- 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 521a4c624..6ea1de7eb 100644 --- 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 eac14f5f9..d804ee798 100644 --- 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