Merge branch 'release-0.2.2' into stable

CHANGELOG.md

@@ -1,20 +1,42 @@
 # Changelog
+All notable changes to this project will be documented in this file.
 
-## 0.2.0
-  - Upgrade baseimage: light-baseimage:1.1.0 (debian stretch)
+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.1.4
-  - Upgrade baseimage: light-baseimage:0.2.6
+## [0.2.2] - 2018-07-29
+### Changed
+  - Upgrade tinc version to 1.1pre16
+
+## [0.2.1] - 2017-09-03
+### Changed
+  - Upgrade tinc version to 1.1pre15
 
-## 0.1.3
-  - Upgrade baseimage: light-baseimage:0.2.5
+## [0.2.0] - 2017-07-19
+### Changed
+  - Upgrade baseimage to light-baseimage:1.1.0 (debian stretch)
+
+## [0.1.4] - 2016-11-08
+### Changed
+  - Upgrade baseimage to light-baseimage:0.2.6
+
+## [0.1.3] - 2016-09-02
+### Changed
+  - Upgrade baseimage to light-baseimage:0.2.5
   - Add TINC_CMD_ARGS environment variable
   - Compile tinc from sources
 
-## 0.1.2 (unreleased)
+## [0.1.1] - 2016-07-26
+### Changed
+  - Upgrade baseimage to experimental-light-baseimage:0.1.3
 
-## 0.1.1
-  - Upgrade baseimage: experimental-light-baseimage:0.1.3
+## 0.1.0 - 2016-02-20
+Initial release
 
-## 0.1.0
-  - Initial release
+[0.2.2]: https://github.com/osixia/docker-tinc/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/osixia/docker-tinc/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/osixia/docker-tinc/compare/v0.1.4...v0.2.0
+[0.1.4]: https://github.com/osixia/docker-tinc/compare/v0.1.3...v0.1.4
+[0.1.3]: https://github.com/osixia/docker-tinc/compare/v0.1.2...v0.1.3
+[0.1.2]: https://github.com/osixia/docker-tinc/compare/v0.1.1...v0.1.2
+[0.1.1]: https://github.com/osixia/docker-tinc/compare/v0.1.0...v0.1.1

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/tinc
-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,29 +1,28 @@
 # Use osixia/light-baseimage
 # sources: https://github.com/osixia/docker-light-baseimage
 FROM osixia/light-baseimage:1.1.0
-MAINTAINER Bertrand Gouny <[email protected]>
 
 # Tinc version
 ARG TINC_VERSION=1.1pre15
 
 # Download, build and install Tinc
 RUN apt-get -y update \
     && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-			 ca-certificates \
-			 curl \
+       ca-certificates \
+       curl \
        gcc \
        libssl1.1 \
        libssl-dev \
        liblzo2-2 \
        liblzo2-dev \
        libncurses5 \
-			 libncurses5-dev \
+       libncurses5-dev \
        libreadline7 \
-			 libreadline-dev \
+       libreadline-dev \
        make \
        pkg-config \
        zlib1g \
-			 zlib1g-dev \
+       zlib1g-dev \
     && curl -o tinc.tar.gz -SL https://www.tinc-vpn.org/packages/tinc-${TINC_VERSION}.tar.gz \
     && mkdir -p /container/tinc-sources \
     && tar -xzf tinc.tar.gz --strip 1 -C /container/tinc-sources \
@@ -33,7 +32,7 @@ RUN apt-get -y update \
     && cd - \
     && mkdir -p /usr/local/var/run/ \
     && apt-get remove -y --purge --auto-remove ca-certificates curl gcc  \
-		  libssl-dev liblzo2-dev libncurses5-dev libreadline-dev make pkg-config zlib1g-dev \
+	   libssl-dev liblzo2-dev libncurses5-dev libreadline-dev make pkg-config zlib1g-dev \
     && rm -f tinc.tar.gz \
     && rm -rf /container/tinc-sources \
     && apt-get clean \