diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-03-27 12:29:18 -0700 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-03-27 12:29:18 -0700 |
| commit | e1ee168e3903571ab82c7c157ce7bb7911c4d514 (patch) | |
| tree | ad01e1125645918003274da0558c08f2b141ca13 /contrib | |
| parent | Merge pull request #6289 (diff) | |
| parent | gitian-build.py: Fixing check for docker command. (diff) | |
| download | monero-e1ee168e3903571ab82c7c157ce7bb7911c4d514.tar.xz | |
Merge pull request #6290
019c1dc0 gitian-build.py: Fixing check for docker command. (Jonathan Cross)
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/gitian/gitian-build.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py index 491488efa..a8140a8a6 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'] |