Forward SSL cert to applications build

This commit is contained in:
Valentin Niess
2020-08-12 14:12:39 +02:00
parent 37d3bdd936
commit 98d54580e0
3 changed files with 12 additions and 6 deletions

View File

@@ -1,6 +1,7 @@
from .build import build_appimage
from .relocate import patch_binary, relocate_python, tcltk_env_string
from .relocate import cert_file_env_string, patch_binary, relocate_python, \
tcltk_env_string
__all__ = ['build_appimage', 'patch_binary', 'relocate_python',
'tcltk_env_string']
__all__ = ['build_appimage', 'cert_file_env_string', 'patch_binary',
'relocate_python', 'tcltk_env_string']

View File

@@ -12,7 +12,8 @@ from ..utils.system import ldd, system
from ..utils.template import copy_template, load_template
__all__ = ["patch_binary", "relocate_python", "tcltk_env_string"]
__all__ = ["cert_file_env_string", "patch_binary", "relocate_python",
"tcltk_env_string"]
def _copy_template(name, destination, **kwargs):

View File

@@ -7,7 +7,7 @@ import shutil
import stat
import struct
from ...appimage import build_appimage, tcltk_env_string
from ...appimage import build_appimage, cert_file_env_string, tcltk_env_string
from ...utils.compat import decode
from ...utils.deps import PREFIX
from ...utils.fs import copy_file, make_tree, remove_file, remove_tree
@@ -256,9 +256,13 @@ def execute(appdir, name=None, python_version=None, linux_tag=None,
entrypoint = load_template(entrypoint_path, **dictionary)
python_pkg = 'AppDir/opt/python{0:}/lib/python{0:}'.format(
python_version)
cert_file = '/opt/_internal/certs.pem'
if not os.path.exists('AppDir' + cert_file):
cert_file = None
dictionary = {'entrypoint': entrypoint,
'shebang': shebang,
'tcltk-env': tcltk_env_string(python_pkg)}
'tcltk-env': tcltk_env_string(python_pkg),
'cert-file': cert_file_env_string(cert_file)}
copy_template(PREFIX + '/data/apprun.sh', 'AppDir/AppRun',
**dictionary)