mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-07 15:31:52 +00:00
update dh-virtualenv (#7526)
This commit is contained in:
parent
3c8a57f080
commit
1fc8914f76
1
changelog.d/7526.misc
Normal file
1
changelog.d/7526.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Update the version of dh-virtualenv we use to build debs, and add focal to the list of target distributions.
|
1
debian/build_virtualenv
vendored
1
debian/build_virtualenv
vendored
@ -36,7 +36,6 @@ esac
|
|||||||
dh_virtualenv \
|
dh_virtualenv \
|
||||||
--install-suffix "matrix-synapse" \
|
--install-suffix "matrix-synapse" \
|
||||||
--builtin-venv \
|
--builtin-venv \
|
||||||
--setuptools \
|
|
||||||
--python "$SNAKE" \
|
--python "$SNAKE" \
|
||||||
--upgrade-pip \
|
--upgrade-pip \
|
||||||
--preinstall="lxml" \
|
--preinstall="lxml" \
|
||||||
|
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -1,16 +1,14 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
matrix-synapse-py3 (1.12.3ubuntu1) UNRELEASED; urgency=medium
|
matrix-synapse-py3 (1.12.3ubuntu1) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
* Add information about .well-known files to Debian installation scripts.
|
* Add information about .well-known files to Debian installation scripts.
|
||||||
|
|
||||||
-- Patrick Cloke <patrickc@matrix.org> Mon, 06 Apr 2020 10:10:38 -0400
|
-- Patrick Cloke <patrickc@matrix.org> Mon, 06 Apr 2020 10:10:38 -0400
|
||||||
=======
|
|
||||||
matrix-synapse-py3 (1.12.4) stable; urgency=medium
|
matrix-synapse-py3 (1.12.4) stable; urgency=medium
|
||||||
|
|
||||||
* New synapse release 1.12.4.
|
* New synapse release 1.12.4.
|
||||||
|
|
||||||
-- Synapse Packaging team <packages@matrix.org> Thu, 23 Apr 2020 10:58:14 -0400
|
-- Synapse Packaging team <packages@matrix.org> Thu, 23 Apr 2020 10:58:14 -0400
|
||||||
>>>>>>> master
|
|
||||||
|
|
||||||
matrix-synapse-py3 (1.12.3) stable; urgency=medium
|
matrix-synapse-py3 (1.12.3) stable; urgency=medium
|
||||||
|
|
||||||
|
@ -27,15 +27,16 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get install \
|
|||||||
wget
|
wget
|
||||||
|
|
||||||
# fetch and unpack the package
|
# fetch and unpack the package
|
||||||
RUN wget -q -O /dh-virtuenv-1.1.tar.gz https://github.com/spotify/dh-virtualenv/archive/1.1.tar.gz
|
RUN mkdir /dh-virtualenv
|
||||||
RUN tar xvf /dh-virtuenv-1.1.tar.gz
|
RUN wget -q -O /dh-virtualenv.tar.gz https://github.com/matrix-org/dh-virtualenv/archive/matrixorg-20200519.tar.gz
|
||||||
|
RUN tar -xv --strip-components=1 -C /dh-virtualenv -f /dh-virtualenv.tar.gz
|
||||||
|
|
||||||
# install its build deps
|
# install its build deps
|
||||||
RUN cd dh-virtualenv-1.1/ \
|
RUN cd /dh-virtualenv \
|
||||||
&& env DEBIAN_FRONTEND=noninteractive mk-build-deps -ri -t "apt-get -yqq --no-install-recommends"
|
&& env DEBIAN_FRONTEND=noninteractive mk-build-deps -ri -t "apt-get -y --no-install-recommends"
|
||||||
|
|
||||||
# build it
|
# build it
|
||||||
RUN cd dh-virtualenv-1.1 && dpkg-buildpackage -us -uc -b
|
RUN cd /dh-virtualenv && dpkg-buildpackage -us -uc -b
|
||||||
|
|
||||||
###
|
###
|
||||||
### Stage 1
|
### Stage 1
|
||||||
@ -68,12 +69,12 @@ RUN apt-get update -qq -o Acquire::Languages=none \
|
|||||||
sqlite3 \
|
sqlite3 \
|
||||||
libpq-dev
|
libpq-dev
|
||||||
|
|
||||||
COPY --from=builder /dh-virtualenv_1.1-1_all.deb /
|
COPY --from=builder /dh-virtualenv_1.2~dev-1_all.deb /
|
||||||
|
|
||||||
# install dhvirtualenv. Update the apt cache again first, in case we got a
|
# install dhvirtualenv. Update the apt cache again first, in case we got a
|
||||||
# cached cache from docker the first time.
|
# cached cache from docker the first time.
|
||||||
RUN apt-get update -qq -o Acquire::Languages=none \
|
RUN apt-get update -qq -o Acquire::Languages=none \
|
||||||
&& apt-get install -yq /dh-virtualenv_1.1-1_all.deb
|
&& apt-get install -yq /dh-virtualenv_1.2~dev-1_all.deb
|
||||||
|
|
||||||
WORKDIR /synapse/source
|
WORKDIR /synapse/source
|
||||||
ENTRYPOINT ["bash","/synapse/source/docker/build_debian.sh"]
|
ENTRYPOINT ["bash","/synapse/source/docker/build_debian.sh"]
|
||||||
|
@ -27,6 +27,7 @@ DISTS = (
|
|||||||
"ubuntu:cosmic",
|
"ubuntu:cosmic",
|
||||||
"ubuntu:disco",
|
"ubuntu:disco",
|
||||||
"ubuntu:eoan",
|
"ubuntu:eoan",
|
||||||
|
"ubuntu:focal",
|
||||||
)
|
)
|
||||||
|
|
||||||
DESC = '''\
|
DESC = '''\
|
||||||
|
Loading…
Reference in New Issue
Block a user