Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ci_build_images/debian-release.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 1 addition & 3 deletions ci_build_images/debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down