From 7ed1fc9ef7a4c4366d365385ed0b1c7136177330 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 11 Sep 2015 08:56:21 -0400 Subject: [PATCH 1/4] docker/install_tini.sh: Add a stub for installing `tini`. --- docker/install_tini.sh | 1 + 1 file changed, 1 insertion(+) create mode 100755 docker/install_tini.sh diff --git a/docker/install_tini.sh b/docker/install_tini.sh new file mode 100755 index 0000000..a9bf588 --- /dev/null +++ b/docker/install_tini.sh @@ -0,0 +1 @@ +#!/bin/bash From 8ce666ad5fa955037e662e97c68ed60006716652 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 11 Sep 2015 08:58:30 -0400 Subject: [PATCH 2/4] docker/install_tini.sh: Get and install the latest version of `tini` from GitHub. --- docker/install_tini.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/install_tini.sh b/docker/install_tini.sh index a9bf588..dd69242 100755 --- a/docker/install_tini.sh +++ b/docker/install_tini.sh @@ -1 +1,8 @@ #!/bin/bash + +apt-get install -y curl grep sed dpkg +TINI_VERSION=`curl https://github.com/krallin/tini/releases/latest | grep -o "/v.*\"" | sed 's:^..\(.*\).$:\1:'` +curl -L "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini_${TINI_VERSION}.deb" > tini.deb +dpkg -i tini.deb +rm tini.deb +apt-get clean From b07741ce0577a716baee003764080bc44db3eaf2 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 11 Sep 2015 08:15:32 -0400 Subject: [PATCH 3/4] Dockerfile: Install `tini` using the script. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index f89fd59..de876c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ ENV PATH=/opt/conda/bin:$PATH \ CONDA_ENV_PATH=/opt/conda ADD docker /usr/share/docker +RUN /usr/share/docker/install_tini.sh ENTRYPOINT [ "/usr/share/docker/entrypoint.sh" ] CMD [ "/bin/bash" ] From d19c60b15801c49974b81e149284cb0ae579f517 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 11 Sep 2015 08:23:13 -0400 Subject: [PATCH 4/4] Dockerfile: Use `tini` for reaping zombies. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index de876c9..2a449ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,5 +23,5 @@ ENV PATH=/opt/conda/bin:$PATH \ ADD docker /usr/share/docker RUN /usr/share/docker/install_tini.sh -ENTRYPOINT [ "/usr/share/docker/entrypoint.sh" ] +ENTRYPOINT [ "/usr/bin/tini", "--", "/usr/share/docker/entrypoint.sh" ] CMD [ "/bin/bash" ]