Commit ce6dc2f9 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch '16-docker-copy-env' into 'main' 

Pass environment to docker CLI calls

Closes #16

See merge request !7
parents bbcfcbf1 4f6958b5

.gitlint

+3 −0
Original line number Diff line number Diff line
@@ -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

behave_utils/docker.py

+3 −3
Original line number Diff line number Diff line
@@ -80,14 +80,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()
@@ -95,7 +95,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)





def _get_docker_host_ip() -> IPAddress: