Skip to content

Commit 9cb214c

Browse files
committed
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.
1 parent be6d9af commit 9cb214c

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

ci_build_images/debian-release.Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@ ARG BASE_IMAGE
77
FROM "$BASE_IMAGE"
88
LABEL maintainer="MariaDB Buildbot maintainers"
99

10-
# This will make apt-get install without question
11-
ARG DEBIAN_FRONTEND=noninteractive
12-
1310
# Install updates and required packages
1411
RUN . /etc/os-release; \
1512
apt-get update \
1613
&& apt-get -y upgrade \
17-
&& apt-get -y install --no-install-recommends \
14+
&& DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
1815
aptly \
1916
buildbot-worker \
2017
ca-certificates \

ci_build_images/debian.Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ ARG MARIADB_BRANCH=11.1
99
LABEL maintainer="MariaDB Buildbot maintainers"
1010
ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
1111

12-
# This will make apt-get install without question
13-
ARG DEBIAN_FRONTEND=noninteractive
14-
1512
# Enable apt sources
1613
RUN . /etc/os-release \
1714
&& if [ -f "/etc/apt/sources.list.d/$ID.sources" ]; then \
@@ -26,6 +23,7 @@ RUN . /etc/os-release \
2623
# Install updates and required packages
2724
# see: https://cryptography.io/en/latest/installation/
2825
RUN . /etc/os-release \
26+
&& export DEBIAN_FRONTEND=noninteractive \
2927
&& apt-get update \
3028
&& apt-get -y upgrade \
3129
&& apt-get -y install --no-install-recommends \

0 commit comments

Comments
 (0)