diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-01-28 17:42:56 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-01-28 17:42:59 +0100 |
| commit | 6ba2ffd28b6bf15e3f70982ccd45256a657c5f70 (patch) | |
| tree | f11d3f752249d74f25a82e9a3cbd69b579932ebd | |
| parent | 4d5eaf7a90bc59d03795b9ade7c8c7bc5c5bf636 (diff) | |
| parent | 624091b7b97ed371900ca7c68f3e2929954e3464 (diff) | |
| download | bitcoin-6ba2ffd28b6bf15e3f70982ccd45256a657c5f70.tar.xz | |
Merge #21004: contrib: Fix docker args conditional in gitian-build
624091b7b97ed371900ca7c68f3e2929954e3464 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 624091b7b97ed371900ca7c68f3e2929954e3464
theStack:
Code review ACK 624091b7b97ed371900ca7c68f3e2929954e3464
Tree-SHA512: e37e2c35aaed813762223e5963e5416d5865b3fb53efb2aac86daaa03b95ccf07db9c3a779446029d055ab89491147c4d900117273e22caed201b21bdf287c58
| -rwxr-xr-x | contrib/gitian-build.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index f105968515..06b15574a7 100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -13,15 +13,16 @@ def setup(): programs = ['ruby', 'git', 'make', 'wget', 'curl'] if args.kvm: programs += ['apt-cacher-ng', 'python-vm-builder', 'qemu-kvm', 'qemu-utils'] - elif args.docker and not os.path.isfile('/lib/systemd/system/docker.service'): - dockers = ['docker.io', 'docker-ce'] - for i in dockers: - return_code = subprocess.call(['sudo', 'apt-get', 'install', '-qq', i]) - if return_code == 0: - break - if return_code != 0: - print('Cannot find any way to install Docker.', file=sys.stderr) - sys.exit(1) + elif args.docker: + if not os.path.isfile('/lib/systemd/system/docker.service'): + dockers = ['docker.io', 'docker-ce'] + for i in dockers: + return_code = subprocess.call(['sudo', 'apt-get', 'install', '-qq', i]) + if return_code == 0: + break + if return_code != 0: + print('Cannot find any way to install Docker.', file=sys.stderr) + sys.exit(1) else: programs += ['apt-cacher-ng', 'lxc', 'debootstrap'] subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs) |