Skip to content

Commit

Permalink
Fix debian packages for sid being called buster. (matrix-org#5775)
Browse files Browse the repository at this point in the history
* Fix debian packages for sid being called buster.

I don't know why the sid images return buster as its codename in
`lsb_release` but it does, so lets just grab the codename from the
distro we pass into dockerfile

* Newsfile
  • Loading branch information
erikjohnston authored and hawkowl committed Jul 29, 2019
1 parent fa87004 commit 3b476f5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.d/5775.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix debian packaging scripts to correctly build sid packages.
5 changes: 5 additions & 0 deletions docker/Dockerfile-dhvirtualenv
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ RUN cd dh-virtualenv-1.1 && dpkg-buildpackage -us -uc -b
###
FROM ${distro}

# Get the distro we want to pull from as a dynamic build variable
# (We need to define it in each build stage)
ARG distro=""
ENV distro ${distro}

# Install the build dependencies
#
# NB: keep this list in sync with the list of build-deps in debian/control
Expand Down
3 changes: 2 additions & 1 deletion docker/build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

set -ex

DIST=`lsb_release -c -s`
# Get the codename from distro env
DIST=`cut -d ':' -f2 <<< $distro`
# we get a read-only copy of the source: make a writeable copy
cp -aT /synapse/source /synapse/build
Expand Down

0 comments on commit 3b476f5

Please sign in to comment.