Skip to content

avoid exit in entrypoint #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patricklodder merged 1 commit into from
Dec 5, 2021
Merged

avoid exit in entrypoint #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions 1.14.5/bullseye/entrypoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ def execute(executable, args):

if executable_path is None:
print(f"{sys.argv[0]}: {executable} not found.", file=sys.stderr)
sys.exit(1)
return 1

#Prepare execve args & launch container command
execve_args = [executable_path] + args
os.execve(executable_path, execve_args, os.environ)
return os.execve(executable_path, execve_args, os.environ)

def characters_cleaner(raw_option):
"""
Expand Down Expand Up @@ -131,7 +131,7 @@ def run_executable(executable, executable_args):
os.setuid(user_info.pw_uid)

#Run container command
execute(executable, executable_args)
return execute(executable, executable_args)

def main():
"""
Expand All @@ -144,14 +144,14 @@ def main():

#Container running arbitrary commands unrelated to dogecoin
if executable not in CLI_EXECUTABLES:
execute(executable, sys.argv[1:])
return execute(executable, sys.argv[1:])

create_datadir()

executable_args = convert_env(executable)
executable_args += sys.argv[1:]

run_executable(executable, executable_args)
return run_executable(executable, executable_args)

if __name__ == "__main__":
main()
sys.exit(main())