Merge branch 'release-0.2.1' into stable

Makefile

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

image/Dockerfile

@@ -4,16 +4,16 @@ FROM osixia/light-baseimage:1.1.0
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Tinc version
-ARG TINC_VERSION=1.1pre14
+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 \
        gcc \
-       libssl1.0.2 \
-       libssl1.0-dev \
+       libssl1.1 \
+       libssl-dev \
        liblzo2-2 \
        liblzo2-dev \
        libncurses5 \
@@ -33,7 +33,7 @@ RUN apt-get -y update \
     && cd - \
     && mkdir -p /usr/local/var/run/ \
     && apt-get remove -y --purge --auto-remove ca-certificates curl gcc  \
-		  libssl1.0-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 \