Sfoglia il codice sorgente

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
tags/v1.3.0rc1
Erik Johnston 4 anni fa
committed by Amber Brown
parent
commit
3b476f5767
3 ha cambiato i file con 8 aggiunte e 1 eliminazioni
  1. +1
    -0
      changelog.d/5775.bugfix
  2. +5
    -0
      docker/Dockerfile-dhvirtualenv
  3. +2
    -1
      docker/build_debian.sh

+ 1
- 0
changelog.d/5775.bugfix Vedi File

@@ -0,0 +1 @@
Fix debian packaging scripts to correctly build sid packages.

+ 5
- 0
docker/Dockerfile-dhvirtualenv Vedi File

@@ -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


+ 2
- 1
docker/build_debian.sh Vedi File

@@ -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


Caricamento…
Annulla
Salva