Skip to content

Commit 3fe4102

Browse files
BertrandGounyBertrandGouny
committed
Merge branch 'hotfix-0.1.4' into stable
2 parents 18ca635 + c54f762 commit 3fe4102

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## 0.1.4
4+
- Upgrade baseimage: light-baseimage:0.2.6
5+
36
## 0.1.3
47
- Upgrade baseimage: light-baseimage:0.2.5
58
- Add TINC_CMD_ARGS environment variable

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = osixia/tinc
2-
VERSION = 0.1.3
2+
VERSION = 0.1.4
33

44
.PHONY: all build build-nocache test tag_latest release
55

‎image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Use osixia/light-baseimage
22
# sources: https://github.com/osixia/docker-light-baseimage
3-
FROM osixia/light-baseimage:0.2.5
3+
FROM osixia/light-baseimage:0.2.6
44
MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
55

66
# Tinc version

0 commit comments

Comments
 (0)