aboutsummaryrefslogtreecommitdiff
path: root/contrib/gitian
diff options
context:
space:
mode:
authorJonathan Cross <jcross@gmail.com>2020-01-10 19:16:24 +0100
committerJonathan Cross <jcross@gmail.com>2020-01-10 19:16:24 +0100
commit019c1dc0bb5fc90ecb6480a0541c074a292bfe18 (patch)
treed6e2d76906b34ddc3c6a4c474cdf3bed21272e43 /contrib/gitian
parent996fa781965887e2b52469234f8cc338b381fe69 (diff)
downloadmonzero-core-019c1dc0bb5fc90ecb6480a0541c074a292bfe18.tar.gz
monzero-core-019c1dc0bb5fc90ecb6480a0541c074a292bfe18.tar.xz
monzero-core-019c1dc0bb5fc90ecb6480a0541c074a292bfe18.zip
gitian-build.py: Fixing check for docker command.
Diffstat (limited to 'contrib/gitian')
-rwxr-xr-xcontrib/gitian/gitian-build.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py
index 64eb218bb..713b0dce5 100755
--- a/contrib/gitian/gitian-build.py
+++ b/contrib/gitian/gitian-build.py
@@ -36,8 +36,11 @@ def setup():
os.chdir('..')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker:
- if not subprocess.call(['docker', '--help'], shell=False, stdout=subprocess.DEVNULL):
- print("Please install docker first manually")
+ try:
+ subprocess.check_output(['docker', '--help'])
+ except:
+ print("ERROR: Could not find 'docker' command. Ensure this is in your PATH.")
+ sys.exit(1)
make_image_prog += ['--docker']
elif not args.kvm:
make_image_prog += ['--lxc']