diff --git a/.gitlint b/.gitlint index b95ed56b48956dfc7cd91f676e9cdded99fd540f..b768ca0dbe129d66177881256ee1e1e5b2e0b043 100644 --- a/.gitlint +++ b/.gitlint @@ -4,4 +4,7 @@ ignore=body-trailing-whitespace,body-is-missing [author-valid-email] regex=.*@[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](\.[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9])+ +[ignore-body-lines] +regex=^Closes [#][0-9]+ + # vim:ft=cfg diff --git a/behave_utils/docker.py b/behave_utils/docker.py index 7f407683a636cca0652d5c0c53ba88e02f50b5cc..e9b07c040a4b957fb35f79d5edab39058a1bcca9 100644 --- a/behave_utils/docker.py +++ b/behave_utils/docker.py @@ -16,6 +16,7 @@ import json import logging from contextlib import contextmanager from os import PathLike +from os import environ from os import fspath from pathlib import Path from secrets import token_hex @@ -73,14 +74,14 @@ def docker(*args: Argument, **env: str) -> None: """ Run a Docker command, with output going to stdout """ - run([DOCKER, *args], env=env, check=True) + run([DOCKER, *args], env={**environ, **env}, check=True) def docker_output(*args: Argument, **env: str) -> str: """ Run a Docker command, capturing and returning its stdout """ - proc = run([DOCKER, *args], env=env, check=True, stdout=PIPE, text=True) + proc = run([DOCKER, *args], env={**environ, **env}, check=True, stdout=PIPE, text=True) return proc.stdout.strip() @@ -88,7 +89,7 @@ def docker_quiet(*args: Argument, **env: str) -> None: """ Run a Docker command, directing its stdout to /dev/null """ - run([DOCKER, *args], env=env, check=True, stdout=DEVNULL) + run([DOCKER, *args], env={**environ, **env}, check=True, stdout=DEVNULL) class IPv4Address(ipaddress.IPv4Address):