docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also allow for non-localhost notary server for notary client 

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
This commit is contained in:
Riyaz Faizullabhoy 2016-04-04 11:13:32 -07:00
parent b00a8641d6
commit 36ad744e79
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc/dockertest.py
View File

@ -50,12 +50,17 @@ REPO_PREFIX = "docker_test"
# Assumes default docker config dir # Assumes default docker config dir
DEFAULT_DOCKER_CONFIG = os.path.expanduser("~/.docker") DEFAULT_DOCKER_CONFIG = os.path.expanduser("~/.docker")
# Assumes the trust server will be run using compose if DOCKER_CONTENT_TRUST_SERVER is not specified
DEFAULT_NOTARY_SERVER = "https://notary-server:4443"
TRUST_SERVER = os.getenv('DOCKER_CONTENT_TRUST_SERVER', DEFAULT_NOTARY_SERVER)
# Assumes the test will be run with `python misc/dockertest.py` from # Assumes the test will be run with `python misc/dockertest.py` from
# the root of the notary repo after binaries are built # the root of the notary repo after binaries are built
NOTARY_CLIENT = "bin/notary -c cmd/notary/config.json" # also overrides the notary server location if need be
if TRUST_SERVER != DEFAULT_NOTARY_SERVER:
# Assumes the trust server will be run using compose if DOCKER_CONTENT_TRUST_SERVER is not specified NOTARY_CLIENT = "bin/notary -s {0}".format(TRUST_SERVER)
TRUST_SERVER = os.getenv('DOCKER_CONTENT_TRUST_SERVER', "https://notary-server:4443") else:
NOTARY_CLIENT = "bin/notary -c cmd/notary/config.json"
# ---- setup ---- # ---- setup ----
@ -100,7 +105,7 @@ def setup():
shutil.copytree(defaulttlsdir, tlsdir) shutil.copytree(defaulttlsdir, tlsdir)
# make sure that the cert is in the right place for local notary # make sure that the cert is in the right place for local notary
if TRUST_SERVER == "https://notary-server:4443": if TRUST_SERVER == DEFAULT_NOTARY_SERVER:
tlsdir = os.path.join(tlsdir, "notary-server:4443") tlsdir = os.path.join(tlsdir, "notary-server:4443")
if not os.path.isdir(tlsdir): if not os.path.isdir(tlsdir):
try: try: