Skip to content

Commit 6462e22

Browse files
committed
MINOR: [Archery] Output full Docker progress when --debug is passed
1 parent ca67ec2 commit 6462e22

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

dev/archery/archery/cli.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def archery(ctx, debug, pdb, quiet):
6363
if debug:
6464
logger.setLevel(logging.DEBUG)
6565

66-
ctx.debug = debug
66+
ctx.obj['debug'] = debug
6767

6868
if pdb:
6969
import pdb

dev/archery/archery/docker/cli.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ def docker(ctx, src, dry_run):
6464

6565
# take the docker-compose parameters like PYTHON, PANDAS, UBUNTU from the
6666
# environment variables to keep the usage similar to docker-compose
67-
compose = DockerCompose(config_path, params=os.environ)
67+
compose = DockerCompose(config_path, params=os.environ,
68+
debug=ctx.obj['debug'])
6869
if dry_run:
6970
_mock_compose_calls(compose)
7071
ctx.obj['compose'] = compose

dev/archery/archery/docker/core.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,12 @@ def __init__(self, docker_bin=None):
164164
class DockerCompose(Command):
165165

166166
def __init__(self, config_path, dotenv_path=None, compose_bin=None,
167-
params=None):
167+
params=None, debug=False):
168168
compose_bin = default_bin(compose_bin, 'docker-compose')
169169
self.config = ComposeConfig(config_path, dotenv_path, compose_bin,
170170
params)
171171
self.bin = compose_bin
172+
self.debug = debug
172173
self.pull_memory = set()
173174

174175
def clear_pull_memory(self):
@@ -296,6 +297,8 @@ def _build(service, use_cache):
296297
self._execute_docker("buildx", "build", *args)
297298
elif using_docker:
298299
# better for caching
300+
if self.debug:
301+
args.append("--progress=plain")
299302
for k, v in service['build'].get('args', {}).items():
300303
args.extend(['--build-arg', '{}={}'.format(k, v)])
301304
for img in cache_from:
@@ -307,6 +310,8 @@ def _build(service, use_cache):
307310
])
308311
self._execute_docker("build", *args)
309312
else:
313+
if self.debug:
314+
args.append("--progress=plain")
310315
self._execute_compose("build", *args, service['name'])
311316

312317
service = self.config.get(service_name)

0 commit comments

Comments
 (0)