40n8.me/baseimage-docker
1
0
Fork 0
mirror of /repos/baseimage-docker.git synced 2026-02-26 17:32:03 +01:00
Code Issues Releases Wiki Activity

Early in the my_init initialization process, do not overwrite already-defined environment variables by the ones in /etc/container_environment.

Browse Source 
Closes GH-52.
This commit is contained in:
Hongli Lai (Phusion)
2014-05-12 16:13:39 +02:00
parent 29d315891f
commit af11b5e7b4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
image/my_init
View File

@@ -54,7 +54,7 @@ def is_exe(path):
except OSError:
return False
def import_envvars(clear_existing_environment = True):
def import_envvars(clear_existing_environment = True, override_existing_environment = True):
new_env = {}
for envfile in listdir("/etc/container_environment"):
name = os.path.basename(envfile)
@@ -67,7 +67,8 @@ def import_envvars(clear_existing_environment = True):
if clear_existing_environment:
os.environ.clear()
for name, value in new_env.items():
os.environ[name] = value
if override_existing_environment or not name in os.environ:
os.environ[name] = value
def export_envvars(to_dir = True):
shell_dump = ""
@@ -227,7 +228,7 @@ def install_insecure_key():
run_command_killable("/usr/sbin/enable_insecure_key")
def main(args):
import_envvars(False)
import_envvars(False, False)
export_envvars()
if args.enable_insecure_key: