Merge pull request #6 from jakirkham/use_tini

Use tini
jakirkham · Sep 11, 2015 · 20fb833 · 20fb833
2 parents 38b3dc2 + d19c60b
commit 20fb833
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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" ]
+ENTRYPOINT [ "/usr/bin/tini", "--", "/usr/share/docker/entrypoint.sh" ]
 CMD [ "/bin/bash" ]
diff --git a/docker/install_tini.sh b/docker/install_tini.sh
@@ -0,0 +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