MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-05 13:14:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

dockersetup: Use -T option with docker-compose exec

Browse Source 
We need to disable the terminal with -T, otherwise it doesn't work
properly.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2019-06-12 13:01:52 +12:00
parent a9729491a8
commit 04979eb03f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dockersetup.py
View File

@ -409,7 +409,7 @@ def setup_https(hostname, http_port, https_port, letsencrypt, cert, cert_key, em
shutil.rmtree(os.path.join(local_cert_dir, 'live')) shutil.rmtree(os.path.join(local_cert_dir, 'live'))
# Create a test file and fetch it to ensure web server is working (for http) # Create a test file and fetch it to ensure web server is working (for http)
return_code = subprocess.call("docker-compose exec layersweb /bin/sh -c 'mkdir -p /var/www/certbot/.well-known/acme-challenge/ ; echo something > /var/www/certbot/.well-known/acme-challenge/test.txt'", shell=True) return_code = subprocess.call("docker-compose exec -T layersweb /bin/sh -c 'mkdir -p /var/www/certbot/.well-known/acme-challenge/ ; echo something > /var/www/certbot/.well-known/acme-challenge/test.txt'", shell=True)
if return_code != 0: if return_code != 0:
print("Creating test file failed") print("Creating test file failed")
sys.exit(1) sys.exit(1)
@ -417,7 +417,7 @@ def setup_https(hostname, http_port, https_port, letsencrypt, cert, cert_key, em
if return_code != 0: if return_code != 0:
print("Reading test file from web server failed") print("Reading test file from web server failed")
sys.exit(1) sys.exit(1)
return_code = subprocess.call(['docker-compose', 'exec', 'layersweb', '/bin/sh', '-c', 'rm -rf /var/www/certbot/.well-known'], shell=False) return_code = subprocess.call(['docker-compose', 'exec', '-T', 'layersweb', '/bin/sh', '-c', 'rm -rf /var/www/certbot/.well-known'], shell=False)
if return_code != 0: if return_code != 0:
print("Removing test file failed") print("Removing test file failed")
sys.exit(1) sys.exit(1)