From 95090974e9982bfa16f12f8fed76902674d6c774 Mon Sep 17 00:00:00 2001 From: William Budington Date: Sat, 21 Mar 2015 01:03:14 +0000 Subject: [PATCH] When running standalone client with docker, do not check container cert output dir for permissions --- Dockerfile | 1 + letsencrypt/client/client.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 02c07f40a..b11baa12c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,4 +12,5 @@ RUN \ virtualenv --no-site-packages -p python2 venv && \ ./venv/bin/python setup.py install +ENV DOCKER_RUN True ENTRYPOINT [ "./venv/bin/letsencrypt", "--text" ] diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py index d415403f3..3a4388076 100644 --- a/letsencrypt/client/client.py +++ b/letsencrypt/client/client.py @@ -336,7 +336,8 @@ def init_csr(privkey, names, cert_dir): csr_pem, csr_der = crypto_util.make_csr(privkey.pem, names) # Save CSR - le_util.make_or_verify_dir(cert_dir, 0o755) + if not os.environ.get('DOCKER_RUN'): + le_util.make_or_verify_dir(cert_dir, 0o755) csr_f, csr_filename = le_util.unique_file( os.path.join(cert_dir, "csr-letsencrypt.pem"), 0o644) csr_f.write(csr_pem)