Merge branch 'release-0.2.0' into stable

Author: BertrandGouny

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.2.0
+  - Upgrade baseimage: light-baseimage:1.1.0 (debian stretch)
+
 ## 0.1.4
   - Upgrade baseimage: light-baseimage:0.2.6
 

Makefile

@@ -1,9 +1,7 @@
 NAME = osixia/tinc
-VERSION = 0.1.4
+VERSION = 0.2.0
 
-.PHONY: all build build-nocache test tag_latest release
-
-all: build
+.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 
 build:
 	docker build -t $(NAME):$(VERSION) --rm image
@@ -14,10 +12,17 @@ build-nocache:
 test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 
-tag_latest:
+tag-latest:
 	docker tag $(NAME):$(VERSION) $(NAME):latest
 
-release: build test tag_latest
-	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	docker push $(NAME)
-	@echo "*** Don't forget to run 'twgit release/hotfix finish' :)"
+push:
+	docker push $(NAME):$(VERSION)
+
+push-latest:
+	docker push $(NAME):latest
+
+release: build test tag-latest push push-latest
+
+git-tag-version: release
+	git tag -a v$(VERSION) -m "v$(VERSION)"
+	git push origin v$(VERSION)

image/Dockerfile

@@ -1,24 +1,24 @@
 # Use osixia/light-baseimage
 # sources: https://github.com/osixia/docker-light-baseimage
-FROM osixia/light-baseimage:0.2.6
+FROM osixia/light-baseimage:1.1.0
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Tinc version
-ENV TINC_VERSION 1.1pre14
+ARG TINC_VERSION=1.1pre14
 
 # 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.0 \
-       libssl-dev \
+       libssl1.0.2 \
+       libssl1.0-dev \
        liblzo2-2 \
        liblzo2-dev \
        libncurses5 \
 			 libncurses5-dev \
-       libreadline6 \
+       libreadline7 \
 			 libreadline-dev \
        make \
        pkg-config \
@@ -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  \
-		   libssl-dev liblzo2-dev libncurses5-dev libreadline-dev make pkg-config zlib1g-dev \
+		  libssl1.0-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 \