hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-08 18:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve logs

Browse Source
This commit is contained in:
Ayaz Salikhov
2021-03-22 15:00:13 +03:00
parent 20e12b93f2
commit 14dfb27d6b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tagging/docker_runner.py
View File

@@ -29,10 +29,11 @@ class DockerRunner:
logger.info(f"Container {self.container.name} removed") logger.info(f"Container {self.container.name} removed")
def run_simple_command(container, cmd): def run_simple_command(container, cmd, print_result=True):
logger.info(f"Running cmd: '{cmd}' on container: {container}") logger.info(f"Running cmd: '{cmd}' on container: {container}")
out = container.exec_run(cmd) out = container.exec_run(cmd)
assert out.exit_code == 0, f"Command: {cmd} failed" assert out.exit_code == 0, f"Command: {cmd} failed"
result = out.output.decode("utf-8").strip() result = out.output.decode("utf-8").strip()
if print_result:
logger.info(f"Command result: {result}") logger.info(f"Command result: {result}")
return result return result

4
tagging/taggers.py
View File

@@ -9,11 +9,11 @@ logger = logging.getLogger(__name__)
def _get_program_version(container, program): def _get_program_version(container, program):
return run_simple_command(container, f"{program} --version") return run_simple_command(container, cmd=f"{program} --version")
def _get_env_variable(container, variable): def _get_env_variable(container, variable):
env = run_simple_command(container, "env").split() env = run_simple_command(container, cmd="env", print_result=False).split()
for env_entry in env: for env_entry in env:
if env_entry.startswith(variable): if env_entry.startswith(variable):
return env_entry[len(variable) + 1:] return env_entry[len(variable) + 1:]