diff options
author | Jakob Borg <jakob@nym.se> | 2015-08-21 13:24:50 +0200 |
---|---|---|
committer | Jakob Borg <jakob@nym.se> | 2015-08-21 13:24:50 +0200 |
commit | 2eead172245f48695e1806b14308de2c07dbe37a (patch) | |
tree | 6c7092a9b0b4640c9df16818c351bec993820a74 /build.sh | |
parent | 626b26a227617de471863e816a290d1603b5fd92 (diff) | |
download | syncthing-2eead172245f48695e1806b14308de2c07dbe37a.tar.gz syncthing-2eead172245f48695e1806b14308de2c07dbe37a.zip |
Actually map the key into Docker
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -134,10 +134,17 @@ case "${1:-default}" in docker-all) img=${DOCKERIMG:-syncthing/build:latest} + if [ -f /etc/syncthing/syncthing.priv ] ; then + # Default signing key location. If present, pass into Docker so we + # can sign the release from in there. + extra=(-v /etc/syncthing/syncthing.priv:/etc/syncthing/syncthing.priv) + fi + docker run --rm -h syncthing-builder -u $(id -u) -t \ -v $(pwd):/go/src/github.com/syncthing/syncthing \ -w /go/src/github.com/syncthing/syncthing \ -e "STTRACE=$STTRACE" \ + ${extra[@]-} \ "$img" \ sh -c './build.sh clean \ && ./build.sh test-cov \ |