diff --git a/Dockerfile b/Dockerfile
index 06dbe7a..a4d6c1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -118,4 +118,8 @@ RUN apk add openssh-client
 ## install compose
 COPY ./bin/ /usr/local/bin/
 
-ENTRYPOINT ["/usr/local/bin/compose-core"]
+## Fixes Ctrl-C handling:
+##   see https://github.com/moby/moby/issues/2838#issuecomment-402491110
+RUN apk add --no-cache tini
+# Tini is now available at /sbin/tini
+ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/compose-core"]
\ No newline at end of file