Actually map the key into Docker

This commit is contained in:
Jakob Borg 2015-08-21 13:24:50 +02:00
parent 626b26a227
commit 2eead17224

View File

@ -134,10 +134,17 @@ case "${1:-default}" in
docker-all) docker-all)
img=${DOCKERIMG:-syncthing/build:latest} 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 \ docker run --rm -h syncthing-builder -u $(id -u) -t \
-v $(pwd):/go/src/github.com/syncthing/syncthing \ -v $(pwd):/go/src/github.com/syncthing/syncthing \
-w /go/src/github.com/syncthing/syncthing \ -w /go/src/github.com/syncthing/syncthing \
-e "STTRACE=$STTRACE" \ -e "STTRACE=$STTRACE" \
${extra[@]-} \
"$img" \ "$img" \
sh -c './build.sh clean \ sh -c './build.sh clean \
&& ./build.sh test-cov \ && ./build.sh test-cov \