diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-29 15:33:32 +0100 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-07-30 00:33:32 +1000 |
| commit | 3b476f57679f21b1bff6c5c90f19e64eaca00fd7 (patch) | |
| tree | aae0c02522cf5993d67ffecb7d2836831d6ad0ca | |
| parent | Merge pull request #5780 from matrix-org/baboliver/loopingcall-args (diff) | |
| download | synapse-3b476f57679f21b1bff6c5c90f19e64eaca00fd7.tar.xz | |
Fix debian packages for sid being called buster. (#5775)
* 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
| -rw-r--r-- | changelog.d/5775.bugfix | 1 | ||||
| -rw-r--r-- | docker/Dockerfile-dhvirtualenv | 5 | ||||
| -rw-r--r-- | docker/build_debian.sh | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/changelog.d/5775.bugfix b/changelog.d/5775.bugfix new file mode 100644 index 0000000000..b124897d80 --- /dev/null +++ b/changelog.d/5775.bugfix @@ -0,0 +1 @@ +Fix debian packaging scripts to correctly build sid packages. diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv index 0117ab8bcc..ac9ebcfd88 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv @@ -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 diff --git a/docker/build_debian.sh b/docker/build_debian.sh index 6ed2b39898..f312f0715f 100644 --- a/docker/build_debian.sh +++ b/docker/build_debian.sh @@ -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 |