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

[docker] override s6-overlay stage3 script avoiding s6 nuke #1337

Merged
merged 1 commit into from
Feb 23, 2018

Conversation

CharlyF
Copy link
Contributor

@CharlyF CharlyF commented Feb 22, 2018

What does this PR do?

Upstream's (s6-overlay) stage3 script was executed on container stop. This script invokes s6-nuke, that sends SIGKILL to every process in the PID namespace except PID1: https://github.com/just-containers/s6-overlay/blob/master/builder/overlay-rootfs/etc/s6/init/init-stage3#L45-L65

This is not necessary when running in a container (as if there were leftover processes, it's docker's job to kill them and reparent zombies to PID1 for reaping), and can cause host system failures if running with --pid=host.

This PR replaces this stage3 with a custom script only doing logging + process reaping.

@CharlyF CharlyF requested a review from a team as a code owner February 22, 2018 23:58
@CharlyF CharlyF force-pushed the charly/s6_rm_finish branch from 38fe913 to 828e001 Compare February 23, 2018 02:13
@masci masci added this to the 6.0.0-rc.4 milestone Feb 23, 2018
@xvello xvello force-pushed the charly/s6_rm_finish branch 3 times, most recently from 1a3ed74 to daef6f1 Compare February 23, 2018 09:30
@xvello xvello changed the title remove finish script avoiding s6 nuke [docker] remove s6-overlay stage3 script avoiding s6 nuke Feb 23, 2018
@xvello xvello changed the title [docker] remove s6-overlay stage3 script avoiding s6 nuke [docker] override s6-overlay stage3 script avoiding s6 nuke Feb 23, 2018
override upstream stage3 with our own

rebase gitlab-ci on master

fix dockerfile

misc cleanups

reno

override stage3 instead of finish
@xvello xvello force-pushed the charly/s6_rm_finish branch from 1dde98c to ce91863 Compare February 23, 2018 11:20
Copy link
Member

@hkaj hkaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@xvello xvello merged commit bd37139 into master Feb 23, 2018
@xvello xvello deleted the charly/s6_rm_finish branch April 11, 2018 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants