diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3db8dd5170f8fef8296a343b07ce1c60043aa497
--- /dev/null
+++ b/.pre-commit-hooks.yaml
@@ -0,0 +1,17 @@
+# vim:ff=unix ts=2 sw=2 ai expandtab
+---
+- id: hadolint
+  name: Hadolint Dockerfile linter
+  description: Dockerfile linter, validate inline bash, written in Haskell
+  minimum_pre_commit_version: '0.18.0'
+  language: docker_image
+  entry: adarnimrod/docker-pre-commit hadolint
+  files: Dockerfile
+- id: docker-compose
+  name: docker-compose config
+  description: Validate the docker-compose file
+  minimum_pre_commit_version: '0.18.0'
+  language: docker_image
+  entry: adarnimrod/docker-pre-commit docker-compose-config
+  files: docker-compose
+  types: [ yaml ]
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..0790b5a936991c9dc926c7637e2149ada44eafce
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM alpine:3.10
+RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ docker-compose && \
+    wget https://github.com/hadolint/hadolint/releases/download/v1.17.1/hadolint-Linux-x86_64 -O /usr/local/bin/hadolint && \
+    chmod +x /usr/local/bin/hadolint