diff --git a/windmill/Dockerfile b/windmill/Dockerfile
index c9847ea..c289ad3 100644
--- a/windmill/Dockerfile
+++ b/windmill/Dockerfile
@@ -1,6 +1,7 @@
 FROM ruby:alpine
 
 RUN	apk add --no-cache \
+	bash \
 	ca-certificates \
 	libxml2 \
 	libxslt \
@@ -27,4 +28,7 @@ RUN	set -x \
 
 WORKDIR /usr/src/windmill
 
-CMD [ "rake", "db:setup", "&&", "ruby", "server.rb" ]
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+
+ENTRYPOINT [ "entrypoint.sh" ]
+CMD [ "ruby", "server.rb" ]
diff --git a/windmill/entrypoint.sh b/windmill/entrypoint.sh
new file mode 100755
index 0000000..7d70d31
--- /dev/null
+++ b/windmill/entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+set -o pipefail
+
+rake db:setup
+
+exec "$@"