1
0
mirror of /repos/baseimage-docker.git synced 2026-02-26 17:32:03 +01:00

my_init: do not use /etc/container_environment if directory doesn't exist

This commit is contained in:
Hongli Lai (Phusion)
2015-07-15 14:33:15 +02:00
parent 9e65ebfbdc
commit e575443aba
2 changed files with 8 additions and 0 deletions

View File

@@ -57,6 +57,8 @@ def is_exe(path):
return False
def import_envvars(clear_existing_environment = True, override_existing_environment = True):
if not os.path.exists("/etc/container_environment"):
return
new_env = {}
for envfile in listdir("/etc/container_environment"):
name = os.path.basename(envfile)
@@ -73,6 +75,8 @@ def import_envvars(clear_existing_environment = True, override_existing_environm
os.environ[name] = value
def export_envvars(to_dir = True):
if not os.path.exists("/etc/container_environment"):
return
shell_dump = ""
for name, value in os.environ.items():
if name in ['HOME', 'USER', 'GROUP', 'UID', 'GID', 'SHELL']: