diff --git a/Dockerfile b/Dockerfile
index e8524ed2c..2d07433ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,9 +7,10 @@ RUN apk add --no-cache bash \
 	git \
 	mercurial \
 	make \
-	build-base
+	build-base \
+	tini
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--", "/entrypoint.sh"]
 CMD [ "-h" ]
 
 COPY scripts/entrypoint.sh /entrypoint.sh