Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Make apt-get less noisy in the Dockerfiles that Complement invokes
Browse files Browse the repository at this point in the history
  • Loading branch information
reivilibre committed Jun 14, 2022
1 parent 24ef372 commit 50b13a8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ FROM docker.io/python:${PYTHON_VERSION}-slim as requirements
RUN \
--mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
apt-get update && apt-get install -y git \
apt-get update -qq && apt-get -o=Dpkg::Use-Pty=0 install -yqq git \
&& rm -rf /var/lib/apt/lists/*

# We install poetry in its own build stage to avoid its dependencies conflicting with
Expand Down Expand Up @@ -73,7 +73,7 @@ FROM docker.io/python:${PYTHON_VERSION}-slim as builder
RUN \
--mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
apt-get update && apt-get install -y \
apt-get update -qq && apt-get -o=Dpkg::Use-Pty=0 install -yqq \
build-essential \
libffi-dev \
libjpeg-dev \
Expand Down Expand Up @@ -118,7 +118,7 @@ LABEL org.opencontainers.image.licenses='Apache-2.0'
RUN \
--mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
apt-get update && apt-get install -y \
apt-get update -qq && apt-get -o=Dpkg::Use-Pty=0 install -yqq \
curl \
gosu \
libjpeg62-turbo \
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile-workers
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ FROM matrixdotorg/synapse:$SYNAPSE_VERSION
RUN \
--mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
apt-get update -qq && \
DEBIAN_FRONTEND=noninteractive apt-get -o=Dpkg::Use-Pty=0 install -yqq --no-install-recommends \
redis-server nginx-light

# Install supervisord with pip instead of apt, to avoid installing a second
Expand Down
2 changes: 1 addition & 1 deletion docker/complement/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FROM matrixdotorg/synapse-workers:$SYNAPSE_VERSION

# Install postgresql
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y postgresql-13
DEBIAN_FRONTEND=noninteractive apt-get -o=Dpkg::Use-Pty=0 install --no-install-recommends -yqq postgresql-13

# Configure a user and create a database for Synapse
RUN pg_ctlcluster 13 main start && su postgres -c "echo \
Expand Down

0 comments on commit 50b13a8

Please sign in to comment.