summary refs log tree commit diff
diff options
context:
space:
mode:
authorH. Shay <hillerys@element.io>2022-03-29 18:22:38 -0700
committerH. Shay <hillerys@element.io>2022-03-29 18:22:38 -0700
commita4c75abfebc28fe9d652e8964f7be4468232a5e6 (patch)
tree85926b2a306a96e9146294c87160712699e06cb7
parentuse requirements.txt (diff)
downloadsynapse-github/shay/dh-poetry.tar.xz
install poetry and run export github/shay/dh-poetry shay/dh-poetry
-rw-r--r--docker/Dockerfile-dhvirtualenv7
-rw-r--r--docker/build_debian.sh3
2 files changed, 10 insertions, 0 deletions
diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv

index fbc1d2346f..f28375d172 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv
@@ -85,6 +85,13 @@ RUN apt-get update -qq -o Acquire::Languages=none \ libpq-dev \ xmlsec1 +RUN pip3 install -U \ + pip \ + setuptools \ + wheel + +RUN pip3 install poetry==1.2.0b1 + COPY --from=builder /dh-virtualenv_1.2.2-1_all.deb / # install dhvirtualenv. Update the apt cache again first, in case we got a diff --git a/docker/build_debian.sh b/docker/build_debian.sh
index 9eae38af91..5adfbb48ca 100644 --- a/docker/build_debian.sh +++ b/docker/build_debian.sh
@@ -11,6 +11,9 @@ DIST=$(cut -d ':' -f2 <<< "${distro:?}") cp -aT /synapse/source /synapse/build cd /synapse/build +# Export a requirements.txt file for the dh-virtualenv to use +poetry export --extras "all test" -o requirements.txt + # if this is a prerelease, set the Section accordingly. # # When the package is later added to the package repo, reprepro will use the