Merge branch 'hotfix-1.0.4' into stable

BertrandGouny · BertrandGouny · commit c280273f33ad · 2015-11-06T13:37:47.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.4
+  - Use light-baseimage:0.1.3
+
 ## 1.0.3
   - Use light-baseimage:0.1.2
   - Fixes :
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/openldap
-VERSION = 1.0.3
+VERSION = 1.0.4
 
 .PHONY: all build test tag_latest release
 
diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/light-baseimage:0.1.2
+FROM osixia/light-baseimage:0.1.3
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Use baseimage's init system.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM osixia/light-baseimage:0.1.2`
	`1`	`+FROM osixia/light-baseimage:0.1.3`
`2`	`2`	`MAINTAINER Bertrand Gouny <[email protected]>`
`3`	`3`
`4`	`4`	`# Use baseimage's init system.`