From bc9ae55723407df2e35fc4bf3d4c2a878ac0884a Mon Sep 17 00:00:00 2001 From: calvin_peyron Date: Fri, 8 Aug 2025 14:11:37 +0200 Subject: [PATCH] Remove redundancy As DEBIAN_FRONTEND has been set as environment variable, there is no need to use DEBIAN_FRONTEND=noninteractive inside RUN lines, it is redundant, hence it has been removed. --- ci-scripts/docker/Dockerfile.cppcheck.xenial | 4 ++-- ci-scripts/docker/Dockerfile.formatting.ubuntu24 | 4 ++-- docker/Dockerfile.base.ubuntu24 | 4 ++-- docker/Dockerfile.base.ubuntu24.cross-arm64 | 6 +++--- docker/Dockerfile.build.fhi72.native_arm.ubuntu24 | 4 ++-- docker/Dockerfile.build.fhi72.ubuntu24 | 4 ++-- docker/Dockerfile.eNB.ubuntu24 | 4 ++-- docker/Dockerfile.gNB.aerial.ubuntu24 | 4 ++-- docker/Dockerfile.gNB.aerial.ubuntu24.sanitize-address | 4 ++-- docker/Dockerfile.gNB.aw2s.ubuntu24 | 4 ++-- docker/Dockerfile.gNB.fhi72.ubuntu24 | 4 ++-- docker/Dockerfile.gNB.ubuntu24 | 4 ++-- docker/Dockerfile.lteRU.ubuntu24 | 4 ++-- docker/Dockerfile.lteUE.ubuntu24 | 4 ++-- docker/Dockerfile.nr-cuup.ubuntu24 | 4 ++-- docker/Dockerfile.nrUE.ubuntu24 | 4 ++-- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ci-scripts/docker/Dockerfile.cppcheck.xenial b/ci-scripts/docker/Dockerfile.cppcheck.xenial index 5a61532346..f2c5856358 100644 --- a/ci-scripts/docker/Dockerfile.cppcheck.xenial +++ b/ci-scripts/docker/Dockerfile.cppcheck.xenial @@ -30,8 +30,8 @@ FROM ubuntu:xenial AS oai-cppcheck ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ build-essential \ vim \ cppcheck diff --git a/ci-scripts/docker/Dockerfile.formatting.ubuntu24 b/ci-scripts/docker/Dockerfile.formatting.ubuntu24 index 2f99a69026..382dcb3514 100644 --- a/ci-scripts/docker/Dockerfile.formatting.ubuntu24 +++ b/ci-scripts/docker/Dockerfile.formatting.ubuntu24 @@ -33,8 +33,8 @@ ARG TARGET_BRANCH ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ gawk \ git diff --git a/docker/Dockerfile.base.ubuntu24 b/docker/Dockerfile.base.ubuntu24 index a1f6daa3c3..959b863368 100644 --- a/docker/Dockerfile.base.ubuntu24 +++ b/docker/Dockerfile.base.ubuntu24 @@ -36,8 +36,8 @@ ENV UHD_VERSION=4.4.0.0 #install developers pkg/repo RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ #gcc needed for build_oai build-essential \ ccache \ diff --git a/docker/Dockerfile.base.ubuntu24.cross-arm64 b/docker/Dockerfile.base.ubuntu24.cross-arm64 index 00c7290f5b..1365df71fe 100644 --- a/docker/Dockerfile.base.ubuntu24.cross-arm64 +++ b/docker/Dockerfile.base.ubuntu24.cross-arm64 @@ -34,7 +34,7 @@ ENV SIMDE_VERSION=389f360a66d4a3bec62b7d71ad8be877487809ba #install developers pkg/repo RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ + apt-get upgrade --yes && \ #enabling arm64 architecture dpkg --add-architecture arm64 && \ echo "deb [arch=arm64] http://ports.ubuntu.com/ noble main restricted\n" \ @@ -49,8 +49,8 @@ RUN apt-get update && \ sed -i -E "s/(deb)\ (http:.+)/\1\ [arch=amd64]\ \2/" /etc/apt/sources.list && \ sed -i '/^Components:/a Architectures: amd64' /etc/apt/sources.list.d/ubuntu.sources && \ apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ build-essential \ psmisc \ git \ diff --git a/docker/Dockerfile.build.fhi72.native_arm.ubuntu24 b/docker/Dockerfile.build.fhi72.native_arm.ubuntu24 index f9f3dc3a8f..96f50fa485 100644 --- a/docker/Dockerfile.build.fhi72.native_arm.ubuntu24 +++ b/docker/Dockerfile.build.fhi72.native_arm.ubuntu24 @@ -32,8 +32,8 @@ ARG KPM_VERSION=KPM_V3_00 ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ meson \ wget \ xz-utils \ diff --git a/docker/Dockerfile.build.fhi72.ubuntu24 b/docker/Dockerfile.build.fhi72.ubuntu24 index b60553dc1c..7b3ade05b0 100644 --- a/docker/Dockerfile.build.fhi72.ubuntu24 +++ b/docker/Dockerfile.build.fhi72.ubuntu24 @@ -32,8 +32,8 @@ ARG KPM_VERSION=KPM_V3_00 ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ meson \ wget \ xz-utils \ diff --git a/docker/Dockerfile.eNB.ubuntu24 b/docker/Dockerfile.eNB.ubuntu24 index 0071d3abef..31e0adce30 100644 --- a/docker/Dockerfile.eNB.ubuntu24 +++ b/docker/Dockerfile.eNB.ubuntu24 @@ -37,8 +37,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ software-properties-common \ procps \ libsctp1 \ diff --git a/docker/Dockerfile.gNB.aerial.ubuntu24 b/docker/Dockerfile.gNB.aerial.ubuntu24 index 40cfbcf185..c31025e039 100644 --- a/docker/Dockerfile.gNB.aerial.ubuntu24 +++ b/docker/Dockerfile.gNB.aerial.ubuntu24 @@ -64,8 +64,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ software-properties-common \ procps \ libsctp1 \ diff --git a/docker/Dockerfile.gNB.aerial.ubuntu24.sanitize-address b/docker/Dockerfile.gNB.aerial.ubuntu24.sanitize-address index 998b7bdd0c..c2bbe7ac88 100644 --- a/docker/Dockerfile.gNB.aerial.ubuntu24.sanitize-address +++ b/docker/Dockerfile.gNB.aerial.ubuntu24.sanitize-address @@ -63,8 +63,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ software-properties-common \ procps \ libsctp1 \ diff --git a/docker/Dockerfile.gNB.aw2s.ubuntu24 b/docker/Dockerfile.gNB.aw2s.ubuntu24 index ca87176258..70c3046508 100644 --- a/docker/Dockerfile.gNB.aw2s.ubuntu24 +++ b/docker/Dockerfile.gNB.aw2s.ubuntu24 @@ -43,8 +43,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ procps \ libsctp1 \ tzdata \ diff --git a/docker/Dockerfile.gNB.fhi72.ubuntu24 b/docker/Dockerfile.gNB.fhi72.ubuntu24 index c83da9004a..fb9d1d43f7 100644 --- a/docker/Dockerfile.gNB.fhi72.ubuntu24 +++ b/docker/Dockerfile.gNB.fhi72.ubuntu24 @@ -37,8 +37,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ software-properties-common \ procps \ pkg-config \ diff --git a/docker/Dockerfile.gNB.ubuntu24 b/docker/Dockerfile.gNB.ubuntu24 index 977c53083d..86fa6d8cbe 100644 --- a/docker/Dockerfile.gNB.ubuntu24 +++ b/docker/Dockerfile.gNB.ubuntu24 @@ -37,8 +37,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ software-properties-common \ procps \ libsctp1 \ diff --git a/docker/Dockerfile.lteRU.ubuntu24 b/docker/Dockerfile.lteRU.ubuntu24 index 80bdaafa9d..de7107f7fd 100644 --- a/docker/Dockerfile.lteRU.ubuntu24 +++ b/docker/Dockerfile.lteRU.ubuntu24 @@ -36,8 +36,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ tzdata \ procps \ software-properties-common \ diff --git a/docker/Dockerfile.lteUE.ubuntu24 b/docker/Dockerfile.lteUE.ubuntu24 index 5faa43f0ab..2b088ddf55 100644 --- a/docker/Dockerfile.lteUE.ubuntu24 +++ b/docker/Dockerfile.lteUE.ubuntu24 @@ -37,8 +37,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ software-properties-common \ procps \ libsctp1 \ diff --git a/docker/Dockerfile.nr-cuup.ubuntu24 b/docker/Dockerfile.nr-cuup.ubuntu24 index e33fc508d0..2c3c58e7e3 100644 --- a/docker/Dockerfile.nr-cuup.ubuntu24 +++ b/docker/Dockerfile.nr-cuup.ubuntu24 @@ -36,8 +36,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ libsctp1 \ libconfig9 \ iproute2 \ diff --git a/docker/Dockerfile.nrUE.ubuntu24 b/docker/Dockerfile.nrUE.ubuntu24 index 061587f04b..94876e9e14 100644 --- a/docker/Dockerfile.nrUE.ubuntu24 +++ b/docker/Dockerfile.nrUE.ubuntu24 @@ -37,8 +37,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ + apt-get upgrade --yes && \ + apt-get install --yes \ software-properties-common \ procps \ libsctp1 \