Merge branch 'hotfix-0.1.4' into stable

osixia · Nov 8, 2016 · 3fe4102 · 3fe4102
2 parents 18ca635 + c54f762
commit 3fe4102
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.4
+  - Upgrade baseimage: light-baseimage:0.2.6
+
 ## 0.1.3
   - Upgrade baseimage: light-baseimage:0.2.5
   - Add TINC_CMD_ARGS environment variable

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/tinc
-VERSION = 0.1.3
+VERSION = 0.1.4
 
 .PHONY: all build build-nocache test tag_latest release
 

diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,6 +1,6 @@
 # Use osixia/light-baseimage
 # sources: https://github.com/osixia/docker-light-baseimage
-FROM osixia/light-baseimage:0.2.5
+FROM osixia/light-baseimage:0.2.6
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Tinc version