diff options
| author | reivilibre <oliverw@matrix.org> | 2022-06-15 15:42:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-15 14:42:27 +0000 |
| commit | 538044ac01696c1b55d0e60418bc9a6bc2b03411 (patch) | |
| tree | 19c59af20fa4b07fde5336bf344c323312144445 /docker | |
| parent | Track a histogram of state res durations (#13036) (diff) | |
| download | synapse-538044ac01696c1b55d0e60418bc9a6bc2b03411.tar.xz | |
Collapse Docker build commands in Complement CI runs to make the logs easier to read. (#13058)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/Dockerfile-workers | 4 | ||||
| -rw-r--r-- | docker/complement/Dockerfile | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 7af0e51f97..c676f83775 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 install -yqq git \ && rm -rf /var/lib/apt/lists/* # We install poetry in its own build stage to avoid its dependencies conflicting with @@ -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 install -yqq \ build-essential \ libffi-dev \ libjpeg-dev \ @@ -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 install -yqq \ curl \ gosu \ libjpeg62-turbo \ diff --git a/docker/Dockerfile-workers b/docker/Dockerfile-workers index 83db0a95b9..0f1570cfb6 100644 --- a/docker/Dockerfile-workers +++ b/docker/Dockerfile-workers @@ -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 install -yqq --no-install-recommends \ redis-server nginx-light # Install supervisord with pip instead of apt, to avoid installing a second diff --git a/docker/complement/Dockerfile b/docker/complement/Dockerfile index 50684c956d..8bec0f6116 100644 --- a/docker/complement/Dockerfile +++ b/docker/complement/Dockerfile @@ -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 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 \ |