From 4aa787db19980593c0f73711f7133b495c346da6 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Sat, 2 Sep 2017 20:46:19 -0700
Subject: [PATCH] v0.18.0

---
 CHANGELOG.md | 7 +++++++
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7deedb3f..64134006 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+0.18.0
+======
+- Add a new `docker_image` language type.  `docker_image` is intended to be a
+  lightweight hook type similar to `system` / `script` which allows one to use
+  an existing docker image that provides a hook.  `docker_image` hooks can
+  also be used as repository `local` hooks.
+
 0.17.0
 ======
 - Fix typos in help
diff --git a/setup.py b/setup.py
index ca842d7e..1ba39286 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
         'hooks.'
     ),
     url='https://github.com/pre-commit/pre-commit',
-    version='0.17.0',
+    version='0.18.0',
 
     author='Anthony Sottile',
     author_email='asottile@umich.edu',