mirror of
https://github.com/phusion/baseimage-docker.git
synced 2026-03-26 12:29:07 +00:00
feat: allow users to specify an alternative init directory
In some existing environments, packages might already use another environment for the purpose this `/etc/my_init.d` directory serves.
This commit is contained in:
committed by
Kingdon Barrett
parent
d6702be8c3
commit
0e15f28fb7
@@ -12,6 +12,8 @@ import stat
|
|||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
ENV_INIT_DIRECTORY = os.environ.get('ENV_INIT_DIRECTORY', '/etc/my_init.d')
|
||||||
|
|
||||||
KILL_PROCESS_TIMEOUT = int(os.environ.get('KILL_PROCESS_TIMEOUT', 5))
|
KILL_PROCESS_TIMEOUT = int(os.environ.get('KILL_PROCESS_TIMEOUT', 5))
|
||||||
KILL_ALL_PROCESSES_TIMEOUT = int(os.environ.get('KILL_ALL_PROCESSES_TIMEOUT', 5))
|
KILL_ALL_PROCESSES_TIMEOUT = int(os.environ.get('KILL_ALL_PROCESSES_TIMEOUT', 5))
|
||||||
|
|
||||||
@@ -250,9 +252,9 @@ def kill_all_processes(time_limit):
|
|||||||
|
|
||||||
|
|
||||||
def run_startup_files():
|
def run_startup_files():
|
||||||
# Run /etc/my_init.d/*
|
# Run ENV_INIT_DIRECTORY*
|
||||||
for name in listdir("/etc/my_init.d"):
|
for name in listdir(ENV_INIT_DIRECTORY):
|
||||||
filename = "/etc/my_init.d/" + name
|
filename = os.path.join(ENV_INIT_DIRECTORY, name)
|
||||||
if is_exe(filename):
|
if is_exe(filename):
|
||||||
info("Running %s..." % filename)
|
info("Running %s..." % filename)
|
||||||
run_command_killable_and_import_envvars(filename)
|
run_command_killable_and_import_envvars(filename)
|
||||||
|
|||||||
Reference in New Issue
Block a user