mirror of https://github.com/krallin/tini.git
Merge pull request #67 from krallin/fix-subreaper
Fix PR_SET_CHILD_SUBREAPER call
This commit is contained in:
commit
79016ecced
|
@ -4,7 +4,7 @@ project (tini C)
|
|||
# Config
|
||||
set (tini_VERSION_MAJOR 0)
|
||||
set (tini_VERSION_MINOR 13)
|
||||
set (tini_VERSION_PATCH 1)
|
||||
set (tini_VERSION_PATCH 2)
|
||||
|
||||
# Build options
|
||||
option(MINIMAL "Disable argument parsing and verbose output" OFF)
|
||||
|
|
|
@ -37,7 +37,7 @@ In Docker, you will want to use an entrypoint so you don't have to remember
|
|||
to manually invoke Tini:
|
||||
|
||||
# Add Tini
|
||||
ENV TINI_VERSION v0.13.1
|
||||
ENV TINI_VERSION v0.13.2
|
||||
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
|
||||
RUN chmod +x /tini
|
||||
ENTRYPOINT ["/tini", "--"]
|
||||
|
@ -63,7 +63,7 @@ The `tini` and `tini-static` binaries are signed using the key `595E85A6B1B4779E
|
|||
You can verify their signatures using `gpg` (which you may install using
|
||||
your package manager):
|
||||
|
||||
ENV TINI_VERSION v0.13.1
|
||||
ENV TINI_VERSION v0.13.2
|
||||
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
|
||||
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc /tini.asc
|
||||
RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
|
||||
|
|
|
@ -306,7 +306,7 @@ int parse_env() {
|
|||
#if HAS_SUBREAPER
|
||||
int register_subreaper () {
|
||||
if (subreaper > 0) {
|
||||
if (prctl(PR_SET_CHILD_SUBREAPER)) {
|
||||
if (prctl(PR_SET_CHILD_SUBREAPER, 1)) {
|
||||
if (errno == EINVAL) {
|
||||
PRINT_FATAL("PR_SET_CHILD_SUBREAPER is unavailable on this platform. Are you using Linux >= 3.4?")
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue