Merge branch 'hotfix-0.1.8' into stable

BertrandGouny · BertrandGouny · commit bf445ef9bf51 · 2015-11-19T15:16:19.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,17 @@
 # Changelog
 
+## 0.1.8
+  - Upgrade baseimage: light-baseimage:0.1.4
+
 ## 0.1.7
-  - Upgrade baseimage: osixia/light-baseimage:0.1.2
+  - Upgrade baseimage: light-baseimage:0.1.2
 
 ## 0.1.6
   - Better way to add custom config
   - Improve documentation
 
 ## 0.1.5
-  - Upgrade baseimage: osixia/light-baseimage:0.1.1
+  - Upgrade baseimage: light-baseimage:0.1.1
 
 ## 0.1.4
   - Use light-baseimage
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 0.1.7
+VERSION = 0.1.8
 
 .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.4
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version

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.4`
`2`	`2`	`MAINTAINER Bertrand Gouny <[email protected]>`
`3`	`3`
`4`	`4`	`# Keepalived version`