diff options
| author | Erik Johnston <erik@matrix.org> | 2021-01-13 10:36:55 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-01-13 10:36:55 +0000 |
| commit | aa4d8c1f9aa32693412642650a7c626e164af286 (patch) | |
| tree | eda7203d761213e14854fd8972c8e693dd1396ff /docker/Dockerfile-dhvirtualenv | |
| parent | Preparatory refactors of OidcHandler (#9067) (diff) | |
| parent | Move removal warning up changelog (diff) | |
| download | synapse-aa4d8c1f9aa32693412642650a7c626e164af286.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'docker/Dockerfile-dhvirtualenv')
| -rw-r--r-- | docker/Dockerfile-dhvirtualenv | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv index 2b7f01f7f7..e529293803 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv @@ -50,17 +50,22 @@ FROM ${distro} ARG distro="" ENV distro ${distro} +# Python < 3.7 assumes LANG="C" means ASCII-only and throws on printing unicode +# http://bugs.python.org/issue19846 +ENV LANG C.UTF-8 + # Install the build dependencies # # NB: keep this list in sync with the list of build-deps in debian/control # TODO: it would be nice to do that automatically. +# TODO: Remove the dh-systemd stanza after dropping support for Ubuntu xenial +# it's a transitional package on all other, more recent releases RUN apt-get update -qq -o Acquire::Languages=none \ && env DEBIAN_FRONTEND=noninteractive apt-get install \ -yqq --no-install-recommends -o Dpkg::Options::=--force-unsafe-io \ build-essential \ debhelper \ devscripts \ - dh-systemd \ libsystemd-dev \ lsb-release \ pkg-config \ @@ -70,7 +75,10 @@ RUN apt-get update -qq -o Acquire::Languages=none \ python3-venv \ sqlite3 \ libpq-dev \ - xmlsec1 + xmlsec1 \ + && ( env DEBIAN_FRONTEND=noninteractive apt-get install \ + -yqq --no-install-recommends -o Dpkg::Options::=--force-unsafe-io \ + dh-systemd || true ) COPY --from=builder /dh-virtualenv_1.2~dev-1_all.deb / |