Skip to content
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.

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

fix: overhaul docker container termination signals #192

Merged
merged 2 commits into from
Jun 29, 2024

Conversation

danny6167
Copy link
Member

@danny6167 danny6167 commented Jun 16, 2024

This PR fixes the stop signal handling in wings. Resolves pterodactyl/panel#4783
The docker API actually expects stings and not the os.signal datatypes we are currently passing though.

This change also make ^C properly an alias of ^SIGINT as it should be, but this part will require a panel change as well to prevent the panel from mangling this before it reaches wings.

danny6167 and others added 2 commits July 1, 2023 17:49
Uses strings to reference signals - This is what docker API is expecting
Rename and Replace Terminate() so we aren't assuming the container immediately dies just because we sent it a signal
^C is now considered a SIGINT (as it should be) however this wont take effect until the panel is updated - use ^SIGINT in egg stop instead
@danny6167 danny6167 marked this pull request as ready for review June 26, 2024 13:50
@danny6167 danny6167 changed the title Fix 4783 stop signal Fix: Use correct data types in docker container stops #4783 Jun 26, 2024
@matthewpi matthewpi changed the title Fix: Use correct data types in docker container stops #4783 fix: overhaul docker container termination signals Jun 29, 2024
@matthewpi matthewpi merged commit 29e4425 into pterodactyl:develop Jun 29, 2024
6 checks passed
dannyhpy pushed a commit to dannyhpy/pterodactyl-wings that referenced this pull request Jul 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 🧨 Awaiting release
Development

Successfully merging this pull request may close these issues.

Wings mishandles signals
2 participants