From 9cb214c750b988c986e2fe55e4c85331c94cd0be Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 25 Sep 2024 09:07:41 +1000 Subject: [PATCH] deb: DEBIAN_FRONTEND=noninteractive is ENV not ARG It would be bad to preserve this as and env, so just apply it per apt-get install, or in debian.Dockerfile since there are so many, add it to the beginning of the build step. --- ci_build_images/debian-release.Dockerfile | 5 +---- ci_build_images/debian.Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ci_build_images/debian-release.Dockerfile b/ci_build_images/debian-release.Dockerfile index ceecbe68..59c9d3a9 100644 --- a/ci_build_images/debian-release.Dockerfile +++ b/ci_build_images/debian-release.Dockerfile @@ -7,14 +7,11 @@ ARG BASE_IMAGE FROM "$BASE_IMAGE" LABEL maintainer="MariaDB Buildbot maintainers" -# This will make apt-get install without question -ARG DEBIAN_FRONTEND=noninteractive - # Install updates and required packages RUN . /etc/os-release; \ apt-get update \ && apt-get -y upgrade \ - && apt-get -y install --no-install-recommends \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ aptly \ buildbot-worker \ ca-certificates \ diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile index 78923dca..209e879e 100644 --- a/ci_build_images/debian.Dockerfile +++ b/ci_build_images/debian.Dockerfile @@ -9,9 +9,6 @@ ARG MARIADB_BRANCH=11.1 LABEL maintainer="MariaDB Buildbot maintainers" ENV CARGO_NET_GIT_FETCH_WITH_CLI=true -# This will make apt-get install without question -ARG DEBIAN_FRONTEND=noninteractive - # Enable apt sources RUN . /etc/os-release \ && if [ -f "/etc/apt/sources.list.d/$ID.sources" ]; then \ @@ -26,6 +23,7 @@ RUN . /etc/os-release \ # Install updates and required packages # see: https://cryptography.io/en/latest/installation/ RUN . /etc/os-release \ + && export DEBIAN_FRONTEND=noninteractive \ && apt-get update \ && apt-get -y upgrade \ && apt-get -y install --no-install-recommends \