From 336b4f9d3538ec5f6f20245f1ef24d7f2e7a196f Mon Sep 17 00:00:00 2001 From: Jana Babovakova Date: Thu, 27 Mar 2025 14:54:19 +0100 Subject: [PATCH] Cherry-pick to add lost data for ubuntu dockers. --- misc/docker/ubuntu-20.10-amd64/Dockerfile | 2 ++ misc/docker/ubuntu-22.04-amd64/Dockerfile | 7 ++++--- misc/docker/ubuntu-22.10-amd64/Dockerfile | 2 ++ misc/docker/ubuntu-23.04-amd64 /Dockerfile | 2 ++ misc/docker/ubuntu-23.10-amd64 /Dockerfile | 2 ++ misc/docker/ubuntu-24.04-amd64 /Dockerfile | 2 ++ misc/docker/ubuntu-24.10-amd64 /Dockerfile | 2 ++ 7 files changed, 16 insertions(+), 3 deletions(-) diff --git a/misc/docker/ubuntu-20.10-amd64/Dockerfile b/misc/docker/ubuntu-20.10-amd64/Dockerfile index cb377ddda..19cb1b858 100644 --- a/misc/docker/ubuntu-20.10-amd64/Dockerfile +++ b/misc/docker/ubuntu-20.10-amd64/Dockerfile @@ -1,4 +1,6 @@ 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 \ diff --git a/misc/docker/ubuntu-22.04-amd64/Dockerfile b/misc/docker/ubuntu-22.04-amd64/Dockerfile index 57806ca8a..86ffc34d1 100644 --- a/misc/docker/ubuntu-22.04-amd64/Dockerfile +++ b/misc/docker/ubuntu-22.04-amd64/Dockerfile @@ -1,9 +1,10 @@ -# 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 \ +#RUN apt-get -y install \ +RUN apt-get -y --no-install-recommends install \ tzdata \ build-essential \ flex \ diff --git a/misc/docker/ubuntu-22.10-amd64/Dockerfile b/misc/docker/ubuntu-22.10-amd64/Dockerfile index 76a9e526a..f796df8ac 100644 --- a/misc/docker/ubuntu-22.10-amd64/Dockerfile +++ b/misc/docker/ubuntu-22.10-amd64/Dockerfile @@ -1,4 +1,6 @@ FROM ubuntu:22.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 --no-install-recommends install \ diff --git a/misc/docker/ubuntu-23.04-amd64 /Dockerfile b/misc/docker/ubuntu-23.04-amd64 /Dockerfile index 9928a6a5d..f5a627973 100644 --- a/misc/docker/ubuntu-23.04-amd64 /Dockerfile +++ b/misc/docker/ubuntu-23.04-amd64 /Dockerfile @@ -1,4 +1,6 @@ FROM ubuntu:23.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 --no-install-recommends install \ diff --git a/misc/docker/ubuntu-23.10-amd64 /Dockerfile b/misc/docker/ubuntu-23.10-amd64 /Dockerfile index 7ddb1a8eb..798bd401f 100644 --- a/misc/docker/ubuntu-23.10-amd64 /Dockerfile +++ b/misc/docker/ubuntu-23.10-amd64 /Dockerfile @@ -1,4 +1,6 @@ FROM ubuntu:23.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 --no-install-recommends install \ diff --git a/misc/docker/ubuntu-24.04-amd64 /Dockerfile b/misc/docker/ubuntu-24.04-amd64 /Dockerfile index 1cd969f44..521a4c624 100644 --- a/misc/docker/ubuntu-24.04-amd64 /Dockerfile +++ b/misc/docker/ubuntu-24.04-amd64 /Dockerfile @@ -1,4 +1,6 @@ FROM ubuntu:24.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 --no-install-recommends install \ diff --git a/misc/docker/ubuntu-24.10-amd64 /Dockerfile b/misc/docker/ubuntu-24.10-amd64 /Dockerfile index 5a4cdef6e..eac14f5f9 100644 --- a/misc/docker/ubuntu-24.10-amd64 /Dockerfile +++ b/misc/docker/ubuntu-24.10-amd64 /Dockerfile @@ -1,4 +1,6 @@ FROM ubuntu:24.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 --no-install-recommends install \ -- 2.47.2