Merge branch 'hotfix-0.1.8' into stable

2015-11-19 15:16:19 +01:00 · 2015-11-19 15:16:19 +01:00 · bf445ef9bf
commit bf445ef9bf
parent de03d7af70 c7291a3a97
3 changed files with 7 additions and 4 deletions
--- 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
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 0.1.7
+VERSION = 0.1.8

 .PHONY: all build test tag_latest release

--- 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