Merge branch 'hotfix-0.1.1' into stable

osixia · Jul 26, 2016 · e08a219 · e08a219
2 parents f01dc57 + 8cb431e
commit e08a219
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
 
+## 0.1.1
+  - Upgrade baseimage: tinc:0.1.1
+
 ## 0.1.0
   - Initial release
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/tinc-etcd
-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,8 +2,6 @@
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/osixia/tinc-etcd.svg)][hub]
 [![Docker Stars](https://img.shields.io/docker/stars/osixia/tinc-etcd.svg)][hub]
-[![Image Size](https://img.shields.io/imagelayers/image-size/osixia/tinc-etcd/latest.svg)](https://imagelayers.io/?images=osixia/tinc-etcd:latest)
-[![Image Layers](https://img.shields.io/imagelayers/layers/osixia/tinc-etcd/latest.svg)](https://imagelayers.io/?images=osixia/tinc-etcd:latest)
 
 [hub]: https://hub.docker.com/r/osixia/tinc-etcd/
 

diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/tinc:0.1.0
+FROM osixia/tinc:0.1.1
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Install multiple process stack from baseimage