Skip to content

Commit 79016ec

Browse files
authored
Merge pull request #67 from krallin/fix-subreaper
Fix PR_SET_CHILD_SUBREAPER call
2 parents d83552d + 81c5447 commit 79016ec

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project (tini C)
44
# Config
55
set (tini_VERSION_MAJOR 0)
66
set (tini_VERSION_MINOR 13)
7-
set (tini_VERSION_PATCH 1)
7+
set (tini_VERSION_PATCH 2)
88

99
# Build options
1010
option(MINIMAL "Disable argument parsing and verbose output" OFF)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ In Docker, you will want to use an entrypoint so you don't have to remember
3737
to manually invoke Tini:
3838

3939
# Add Tini
40-
ENV TINI_VERSION v0.13.1
40+
ENV TINI_VERSION v0.13.2
4141
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
4242
RUN chmod +x /tini
4343
ENTRYPOINT ["/tini", "--"]
@@ -63,7 +63,7 @@ The `tini` and `tini-static` binaries are signed using the key `595E85A6B1B4779E
6363
You can verify their signatures using `gpg` (which you may install using
6464
your package manager):
6565

66-
ENV TINI_VERSION v0.13.1
66+
ENV TINI_VERSION v0.13.2
6767
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
6868
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc /tini.asc
6969
RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \

src/tini.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ int parse_env() {
306306
#if HAS_SUBREAPER
307307
int register_subreaper () {
308308
if (subreaper > 0) {
309-
if (prctl(PR_SET_CHILD_SUBREAPER)) {
309+
if (prctl(PR_SET_CHILD_SUBREAPER, 1)) {
310310
if (errno == EINVAL) {
311311
PRINT_FATAL("PR_SET_CHILD_SUBREAPER is unavailable on this platform. Are you using Linux >= 3.4?")
312312
} else {

0 commit comments

Comments
 (0)