diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-07-15 17:26:12 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-07-15 17:26:18 -0400 |
| commit | c0f1569557eccf4e3be6a13aaf1ad1810c98e598 (patch) | |
| tree | 3abdfef41c41e778614d34ce035d335388c92a04 /contrib | |
| parent | 8803c9132a78d8182bd828a29f7051fc7688f934 (diff) | |
| parent | 86967b2e35d500bb4a5053c44aed809775a3e04e (diff) | |
| download | bitcoin-c0f1569557eccf4e3be6a13aaf1ad1810c98e598.tar.xz | |
Merge #13368: Update gitian-build.sh for docker
86967b2e35 Add option to use docker for gitian-build.sh (Andrew Chow)
Pull request description:
Updates gitian-build.sh script for the docker virtualization method recently added to gitian-builder.
Second commit depends on https://github.com/devrandom/gitian-builder/pull/185
Tree-SHA512: 0fa50b6c1be35a7a39f4a82816369637d3d0082922ac9876b80ae8156c795dec0ff34ad384b5348777042df8ddb6a72bbaeddd7002ef80557b10e2acf46632aa
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/gitian-build.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh index 05e7d6f4c6..4517b28c10 100755 --- a/contrib/gitian-build.sh +++ b/contrib/gitian-build.sh @@ -22,6 +22,7 @@ url=https://github.com/bitcoin/bitcoin proc=2 mem=2000 lxc=true +docker=false osslTarUrl=http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz osslPatchUrl=https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch scriptName=$(basename -- "$0") @@ -49,6 +50,7 @@ Options: -j Number of processes to use. Default 2 -m Memory to allocate in MiB. Default 2000 --kvm Use KVM instead of LXC +--docker Use Docker instead of LXC --setup Set up the Gitian building environment. Uses LXC. If you want to use KVM, use the --kvm option. Only works on Debian-based systems (Ubuntu, Debian) --detach-sign Create the assert file for detached signing. Will not commit anything. --no-commit Do not commit anything to git @@ -157,6 +159,16 @@ while :; do --kvm) lxc=false ;; + # docker + --docker) + if [[ $lxc = false ]] + then + echo 'Error: cannot have both kvm and docker' + exit 1 + fi + lxc=false + docker=true + ;; # Detach sign --detach-sign) signProg="true" @@ -182,6 +194,12 @@ then export USE_LXC=1 fi +# Setup docker +if [[ $docker = true ]] +then + export USE_DOCKER=1 +fi + # Check for OSX SDK if [[ ! -e "gitian-builder/inputs/MacOSX10.11.sdk.tar.gz" && $osx == true ]] then @@ -239,6 +257,10 @@ then then sudo apt-get install lxc bin/make-base-vm --suite trusty --arch amd64 --lxc + elif [[ -n "$USE_DOCKER" ]] + then + sudo apt-get install docker-ce + bin/make-base-vm --suite trusty --arch amd64 --docker else bin/make-base-vm --suite trusty --arch amd64 fi |