Merge branch 'hotfix-0.1.1' into stable

BertrandGouny · BertrandGouny · commit ed9430cda4eb · 2016-07-26T14:55:07.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
 
+## 0.1.1
+  - Upgrade baseimage: experimental-light-baseimage:0.1.3
+
 ## 0.1.0
   - Initial release
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/tinc
-VERSION = 0.1.0
+VERSION = 0.1.1
 
 .PHONY: all build build-nocache test tag_latest release
 
diff --git a/README.md b/README.md
@@ -2,7 +2,5 @@
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/osixia/tinc.svg)][hub]
 [![Docker Stars](https://img.shields.io/docker/stars/osixia/tinc.svg)][hub]
-[![Image Size](https://img.shields.io/imagelayers/image-size/osixia/tinc/latest.svg)](https://imagelayers.io/?images=osixia/tinc:latest)
-[![Image Layers](https://img.shields.io/imagelayers/layers/osixia/tinc/latest.svg)](https://imagelayers.io/?images=osixia/tinc:latest)
 
 [hub]: https://hub.docker.com/r/osixia/tinc/
diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/experimental-light-baseimage:0.1.2
+FROM osixia/experimental-light-baseimage:0.1.3
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Install OpenLDAP, ldap-utils and ssl-helper from baseimage and remove default ldap db

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM osixia/experimental-light-baseimage:0.1.2`
	`1`	`+FROM osixia/experimental-light-baseimage:0.1.3`
`2`	`2`	`MAINTAINER Bertrand Gouny <[email protected]>`
`3`	`3`
`4`	`4`	`# Install OpenLDAP, ldap-utils and ssl-helper from baseimage and remove default ldap db`