Merge branch 'release-0.2.1' into stable

osixia · Sep 3, 2017 · 8ae312e · 8ae312e
2 parents 2bab7ed + 5cbc84b
commit 8ae312e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.1
+ - etcdctl v3.2.7
+ - Upgrade baseimage: tinc:0.2.1 (tinc 1.1pre15)
+
 ## 0.2.0
   - etcdctl v3.2.1
   - Upgrade baseimage: tinc:0.2.0 (debian stretch)

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/tinc-etcd
-VERSION = 0.2.0
+VERSION = 0.2.1
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 

diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,7 +1,7 @@
-FROM osixia/tinc:0.2.0
+FROM osixia/tinc:0.2.1
 MAINTAINER Bertrand Gouny <[email protected]>
 
-ARG ETCD_VERSION=3.2.1
+ARG ETCD_VERSION=3.2.7
 
 # Install multiple process stack from baseimage
 # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/install-multiple-process-stack