monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 03:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6290

Browse source 
019c1dc0 gitian-build.py: Fixing check for docker command. (Jonathan Cross)
This commit is contained in:
Alexander Blair 2020-03-27 12:29:18 -07:00
commit e1ee168e39
No known key found for this signature in database
GPG key ID: C64552D877C32479
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
contrib/gitian/gitian-build.py
View file

@ -36,8 +36,11 @@ def setup():
os.chdir('..') os.chdir('..')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker: if args.docker:
if not subprocess.call(['docker', '--help'], shell=False, stdout=subprocess.DEVNULL): try:
print("Please install docker first manually") 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'] make_image_prog += ['--docker']
elif not args.kvm: elif not args.kvm:
make_image_prog += ['--lxc'] make_image_prog += ['--lxc']