Merge branch 'hotfix-0.1.6' into stable

osixia · Nov 20, 2015 · e3a5ae6 · e3a5ae6
2 parents 8f0aded + 9414e7e
commit e3a5ae6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.6
+  - Upgrade baseimage: openldap:1.0.7
+
 ## 0.1.5
   - Upgrade baseimage: openldap:1.0.6
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/openldap-backup
-VERSION = 0.1.5
+VERSION = 0.1.6
 
 .PHONY: all build test tag_latest release
 

diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/openldap:1.0.6
+FROM osixia/openldap:1.0.7
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Use baseimage's init system.