Merge branch 'hotfix-0.2.3' into stable

Author: BertrandGouny

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 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.3] - 2018-10-15
+### Changed
+  - Upgrade tinc version to 1.1pre17
+
 ## [0.2.2] - 2018-07-29
 ### Changed
   - Upgrade tinc version to 1.1pre16

Makefile

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

image/Dockerfile

@@ -3,26 +3,26 @@
 FROM osixia/light-baseimage:1.1.0
 
 # Tinc version
-ARG TINC_VERSION=1.1pre15
+ARG TINC_VERSION=1.1pre17
 
 # 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 \
-       gcc \
-       libssl1.1 \
-       libssl-dev \
-       liblzo2-2 \
-       liblzo2-dev \
-       libncurses5 \
-       libncurses5-dev \
-       libreadline7 \
-       libreadline-dev \
-       make \
-       pkg-config \
-       zlib1g \
-       zlib1g-dev \
+    ca-certificates \
+    curl \
+    gcc \
+    libssl1.1 \
+    libssl-dev \
+    liblzo2-2 \
+    liblzo2-dev \
+    libncurses5 \
+    libncurses5-dev \
+    libreadline7 \
+    libreadline-dev \
+    make \
+    pkg-config \
+    zlib1g \
+    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 \
@@ -32,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 \