Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-02 22:18:29 +01:00
Code Issues Projects Releases Wiki Activity

Enhance: output the stdout of gen cert script

Browse Source 
use popen replace check_all

Signed-off-by: DQ <dengq@vmware.com>
This commit is contained in:
DQ 2020-04-26 19:13:55 +08:00
parent 06d955c6e3
commit 90faf700f8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
make/photon/prepare/commands/gencerts.py
View File

@ -2,7 +2,8 @@ import os
import sys import sys
import click import click
import pathlib import pathlib
from subprocess import check_call, PIPE, STDOUT import logging
from subprocess import Popen, PIPE, STDOUT, CalledProcessError
from utils.cert import openssl_installed from utils.cert import openssl_installed
from utils.misc import get_realpath from utils.misc import get_realpath
@ -25,8 +26,8 @@ def gencert(path, days):
if not os.path.exists(path): if not os.path.exists(path):
click.echo('path {} not exist, create it...'.format(path)) click.echo('path {} not exist, create it...'.format(path))
os.makedirs(path, exist_ok=True) os.makedirs(path, exist_ok=True)
with Popen([gen_tls_script, days], stdout=PIPE, stderr=STDOUT, cwd=path) as p:
shell_stat = check_call([gen_tls_script, days], stdout=PIPE, stderr=STDOUT, cwd=path) for line in p.stdout:
if shell_stat != 0: click.echo(line, nl=False)
click.echo('Can not generate internal tls certs') if p.returncode != 0:
sys.exit(-1) raise CalledProcessError(p.returncode, p.args)