Skip to content

Commit 6ba2ffd

Browse files
author
MarcoFalke
committed
Merge bitcoin#21004: contrib: Fix docker args conditional in gitian-build
624091b Fix docker args conditional (setpill) Pull request description: The conditional that checks if docker needs to be installed has the side effect of triggering the default `lxc` branch in case docker comes preinstalled. This is clearly not intentional. ACKs for top commit: laanwj: Code review ACK 624091b theStack: Code review ACK 624091b Tree-SHA512: e37e2c35aaed813762223e5963e5416d5865b3fb53efb2aac86daaa03b95ccf07db9c3a779446029d055ab89491147c4d900117273e22caed201b21bdf287c58
2 parents 4d5eaf7 + 624091b commit 6ba2ffd

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

contrib/gitian-build.py

+10-9
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ def setup():
1313
programs = ['ruby', 'git', 'make', 'wget', 'curl']
1414
if args.kvm:
1515
programs += ['apt-cacher-ng', 'python-vm-builder', 'qemu-kvm', 'qemu-utils']
16-
elif args.docker and not os.path.isfile('/lib/systemd/system/docker.service'):
17-
dockers = ['docker.io', 'docker-ce']
18-
for i in dockers:
19-
return_code = subprocess.call(['sudo', 'apt-get', 'install', '-qq', i])
20-
if return_code == 0:
21-
break
22-
if return_code != 0:
23-
print('Cannot find any way to install Docker.', file=sys.stderr)
24-
sys.exit(1)
16+
elif args.docker:
17+
if not os.path.isfile('/lib/systemd/system/docker.service'):
18+
dockers = ['docker.io', 'docker-ce']
19+
for i in dockers:
20+
return_code = subprocess.call(['sudo', 'apt-get', 'install', '-qq', i])
21+
if return_code == 0:
22+
break
23+
if return_code != 0:
24+
print('Cannot find any way to install Docker.', file=sys.stderr)
25+
sys.exit(1)
2526
else:
2627
programs += ['apt-cacher-ng', 'lxc', 'debootstrap']
2728
subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs)

0 commit comments

Comments
 (0)