From e19396d62241c5619051e5aa15c9f53e2568fa45 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Fri, 29 Jan 2021 14:56:04 +0000 Subject: Fix Debian builds on Xenial (#9254) Adds note about updating dh-virtualenv once we drop support for Xenial. We can't update now, because it needs debhelper 12, while Xenial only backports 10. Signed-off-by: Dan Callahan --- docker/Dockerfile-dhvirtualenv | 1 + 1 file changed, 1 insertion(+) (limited to 'docker') diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv index e529293803..0d74630370 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv @@ -27,6 +27,7 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get install \ wget # fetch and unpack the package +# TODO: Upgrade to 1.2.2 once xenial is dropped RUN mkdir /dh-virtualenv RUN wget -q -O /dh-virtualenv.tar.gz https://github.com/spotify/dh-virtualenv/archive/ac6e1b1.tar.gz RUN tar -xv --strip-components=1 -C /dh-virtualenv -f /dh-virtualenv.tar.gz -- cgit 1.5.1 From b8b172466fe1605e29e8a4642fcce47ecf2ca7f0 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Mon, 15 Feb 2021 15:30:16 +0000 Subject: Add rustc to Docker image build environment (#9405) This is needed to build the cryptography library, since it does not provide wheels for ARMv7. Fixes #9403 Signed-off-by: Dan Callahan --- changelog.d/9405.misc | 1 + docker/Dockerfile | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 changelog.d/9405.misc (limited to 'docker') diff --git a/changelog.d/9405.misc b/changelog.d/9405.misc new file mode 100644 index 0000000000..d82c3b832f --- /dev/null +++ b/changelog.d/9405.misc @@ -0,0 +1 @@ +Add rustc as a dependency when building Docker images. diff --git a/docker/Dockerfile b/docker/Dockerfile index afd896ffc1..d619ee08ed 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -28,11 +28,13 @@ RUN apt-get update && apt-get install -y \ libwebp-dev \ libxml++2.6-dev \ libxslt1-dev \ + rustc \ zlib1g-dev \ && rm -rf /var/lib/apt/lists/* # Build dependencies that are not available as wheels, to speed up rebuilds RUN pip install --prefix="/install" --no-warn-script-location \ + cryptography \ frozendict \ jaeger-client \ opentracing \ -- cgit 1.5.1