Merge branch 'release-0.2.2' into stable

CHANGELOG.md

@@ -1,23 +1,45 @@
 # Changelog
+All notable changes to this project will be documented in this file.
 
-## 0.2.1
- - etcdctl v3.2.7
- - Upgrade baseimage: tinc:0.2.1 (tinc 1.1pre15)
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 0.2.0
-  - etcdctl v3.2.1
-  - Upgrade baseimage: tinc:0.2.0 (debian stretch)
+## [0.2.2] - 2018-07-29
+### Changed
+ - Upgrade etcdctl version to v3.3.9
+ - Upgrade baseimage to tinc:0.2.2 (tinc 1.1pre16)
 
-## 0.1.3
-  - Upgrade baseimage: tinc:0.1.4
+## [0.2.1] - 2017-09-03
+### Changed
+ - Upgrade etcdctl version to v3.2.7
+ - Upgrade baseimage to tinc:0.2.1 (tinc 1.1pre15)
 
-## 0.1.2
-  - Upgrade baseimage: tinc:0.1.3
+## [0.2.0] - 2017-07-19
+### Changed
+  - Upgrade etcdctl version to v3.2.1
+  - Upgrade baseimage to tinc:0.2.0 (debian stretch)
+
+## [0.1.3] - 2016-11-08
+### Changed
+  - Upgrade baseimage to tinc:0.1.4
+
+## [0.1.2] - 2016-09-02
+### Changed
+  - Upgrade etcdctl version to v3.0.4
+  - Upgrade baseimage to tinc:0.1.3
+### Removed
   - Remove etcdctl from repo, download from official release
-  - etcdctl v3.0.4
 
-## 0.1.1
-  - Upgrade baseimage: tinc:0.1.1
+## [0.1.1] - 2016-07-26
+### Changed
+  - Upgrade baseimage to tinc:0.1.1
+
+## 0.1.0 - 2016-02-20
+Initial release
 
-## 0.1.0
-  - Initial release
+[0.2.2]: https://github.com/osixia/docker-tinc-etcd/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/osixia/docker-tinc-etcd/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/osixia/docker-tinc-etcd/compare/v0.1.3...v0.2.0
+[0.1.3]: https://github.com/osixia/docker-tinc-etcd/compare/v0.1.2...v0.1.3
+[0.1.2]: https://github.com/osixia/docker-tinc-etcd/compare/v0.1.1...v0.1.2
+[0.1.1]: https://github.com/osixia/docker-tinc-etcd/compare/v0.1.0...v0.1.1

Makefile

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

image/Dockerfile

@@ -1,7 +1,6 @@
-FROM osixia/tinc:0.2.1
-MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
+FROM osixia/tinc:0.2.2
 
-ARG ETCD_VERSION=3.2.7
+ARG ETCD_VERSION=3.3.9
 
 # Install multiple process stack from baseimage
 # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/install-multiple-process-stack