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 * Newsfilepull/5787/head
parent
fa87004bc1
commit
3b476f5767
|
@ -0,0 +1 @@
|
||||||
|
Fix debian packaging scripts to correctly build sid packages.
|
|
@ -42,6 +42,11 @@ RUN cd dh-virtualenv-1.1 && dpkg-buildpackage -us -uc -b
|
||||||
###
|
###
|
||||||
FROM ${distro}
|
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
|
# Install the build dependencies
|
||||||
#
|
#
|
||||||
# NB: keep this list in sync with the list of build-deps in debian/control
|
# NB: keep this list in sync with the list of build-deps in debian/control
|
||||||
|
|
|
@ -4,7 +4,8 @@
|
||||||
|
|
||||||
set -ex
|
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
|
# we get a read-only copy of the source: make a writeable copy
|
||||||
cp -aT /synapse/source /synapse/build
|
cp -aT /synapse/source /synapse/build
|
||||||
|
|
Loading…
Reference in New Issue