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

Remove workaround for Docker bug #2267 now that Docker has fixed this

Browse Source 
Closes GH-155.
This commit is contained in:
Hongli Lai (Phusion)
2015-01-16 16:45:26 +01:00
parent e77d34aedf
commit 19c2df66b3
5 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
image/bin/my_init
View File

@@ -56,9 +56,6 @@ def is_exe(path):
except OSError:
return False
def create_hosts_file():
run_command_killable("/bin/cp", "/etc/hosts", "/etc/workaround-docker-2267/")
def import_envvars(clear_existing_environment = True, override_existing_environment = True):
new_env = {}
for envfile in listdir("/etc/container_environment"):
@@ -252,7 +249,6 @@ def install_insecure_key():
run_command_killable("/usr/sbin/enable_insecure_key")
def main(args):
create_hosts_file()
import_envvars(False, False)
export_envvars()