diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-06-03 12:21:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 12:21:58 +0100 |
| commit | 2a8ed93bd42518042d732ff79559b769f52bedeb (patch) | |
| tree | 98e605c89871b79ad437dd7c3467054c7051c096 | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-2a8ed93bd42518042d732ff79559b769f52bedeb.tar.xz | |
Switch back to upstream dh-virtualenv (#7621)
Upstream have merged our changes (https://github.com/spotify/dh-virtualenv/pull/300), so let's switch back to it instead of using our fork.
| -rw-r--r-- | changelog.d/7621.misc | 1 | ||||
| -rw-r--r-- | docker/Dockerfile-dhvirtualenv | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/7621.misc b/changelog.d/7621.misc new file mode 100644 index 0000000000..032a7de6e6 --- /dev/null +++ b/changelog.d/7621.misc @@ -0,0 +1 @@ +Switch to upstream `dh-virtualenv` rather than our fork for Debian package builds. diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv index bf6af74104..619585d5fa 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv @@ -28,7 +28,7 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get install \ # fetch and unpack the package RUN mkdir /dh-virtualenv -RUN wget -q -O /dh-virtualenv.tar.gz https://github.com/matrix-org/dh-virtualenv/archive/matrixorg-20200519.tar.gz +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 # install its build deps. We do another apt-cache-update here, because we might |