Commit 4f6958b5 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Pass environment to docker CLI calls

Closes #16
parent e777757d
Loading
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -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):