From fc27abba7878205a243f4ec2b7d96ab9f9e0863a Mon Sep 17 00:00:00 2001 From: Mathieu Velten Date: Wed, 14 Sep 2022 15:43:08 +0200 Subject: [PATCH 1/3] Fix Docker build when Rust .so has been build locally first Signed-off-by: Mathieu Velten --- .dockerignore | 1 + docker/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index 8eb1e4df8a9f..5670b8c15bf2 100644 --- a/.dockerignore +++ b/.dockerignore @@ -11,5 +11,6 @@ !build_rust.py rust/target +synapse/*.so **/__pycache__ diff --git a/docker/Dockerfile b/docker/Dockerfile index a057bf397b18..b7623ed7ca9c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,7 +31,7 @@ ARG PYTHON_VERSION=3.9 ### ### Stage 0: generate requirements.txt ### -FROM docker.io/python:${PYTHON_VERSION}-slim as requirements +FROM docker.io/python:${PYTHON_VERSION}-slim-bullseye as requirements # RUN --mount is specific to buildkit and is documented at # https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/syntax.md#build-mounts-run---mount. @@ -76,7 +76,7 @@ RUN if [ -z "$TEST_ONLY_IGNORE_POETRY_LOCKFILE" ]; then \ ### ### Stage 1: builder ### -FROM docker.io/python:${PYTHON_VERSION}-slim as builder +FROM docker.io/python:${PYTHON_VERSION}-slim-bullseye as builder # install the OS build deps RUN \ @@ -137,7 +137,7 @@ RUN if [ -z "$TEST_ONLY_IGNORE_POETRY_LOCKFILE" ]; then \ ### Stage 2: runtime ### -FROM docker.io/python:${PYTHON_VERSION}-slim +FROM docker.io/python:${PYTHON_VERSION}-slim-bullseye LABEL org.opencontainers.image.url='https://matrix.org/docs/projects/server/synapse' LABEL org.opencontainers.image.documentation='https://github.com/matrix-org/synapse/blob/master/docker/README.md' From f20b366941b3c521b1fca8b82ef13dc1b5937f1c Mon Sep 17 00:00:00 2001 From: Mathieu Velten Date: Wed, 14 Sep 2022 15:48:06 +0200 Subject: [PATCH 2/3] add changelog --- changelog.d/13811.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/13811.misc diff --git a/changelog.d/13811.misc b/changelog.d/13811.misc new file mode 100644 index 000000000000..7d8fb06a0f44 --- /dev/null +++ b/changelog.d/13811.misc @@ -0,0 +1 @@ +Fix Docker build when Rust .so has been build locally first. From a05a61ba93136096bf3d258337e1cd3193a0b4f1 Mon Sep 17 00:00:00 2001 From: Mathieu Velten Date: Fri, 16 Sep 2022 17:02:58 +0200 Subject: [PATCH 3/3] Add comment --- docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index b7623ed7ca9c..b20951d4cf62 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,6 +31,8 @@ ARG PYTHON_VERSION=3.9 ### ### Stage 0: generate requirements.txt ### +# We hardcode the use of Debian bullseye here because this could change upstream +# and other Dockerfiles used for testing are expecting bullseye. FROM docker.io/python:${PYTHON_VERSION}-slim-bullseye as requirements # RUN --mount is specific to buildkit and is documented at