Skip to content

Commit 59c48ce

Browse files
committed
1.1pre16
1 parent a0963b9 commit 59c48ce

File tree

3 files changed

+40
-19
lines changed

3 files changed

+40
-19
lines changed

CHANGELOG.md

+33-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,42 @@
11
# Changelog
2+
All notable changes to this project will be documented in this file.
23

3-
## 0.2.0
4-
- Upgrade baseimage: light-baseimage:1.1.0 (debian stretch)
4+
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
5+
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
56

6-
## 0.1.4
7-
- Upgrade baseimage: light-baseimage:0.2.6
7+
## [0.2.2] - 2018-07-29
8+
### Changed
9+
- Upgrade tinc version to 1.1pre16
10+
11+
## [0.2.1] - 2017-09-03
12+
### Changed
13+
- Upgrade tinc version to 1.1pre15
814

9-
## 0.1.3
10-
- Upgrade baseimage: light-baseimage:0.2.5
15+
## [0.2.0] - 2017-07-19
16+
### Changed
17+
- Upgrade baseimage to light-baseimage:1.1.0 (debian stretch)
18+
19+
## [0.1.4] - 2016-11-08
20+
### Changed
21+
- Upgrade baseimage to light-baseimage:0.2.6
22+
23+
## [0.1.3] - 2016-09-02
24+
### Changed
25+
- Upgrade baseimage to light-baseimage:0.2.5
1126
- Add TINC_CMD_ARGS environment variable
1227
- Compile tinc from sources
1328

14-
## 0.1.2 (unreleased)
29+
## [0.1.1] - 2016-07-26
30+
### Changed
31+
- Upgrade baseimage to experimental-light-baseimage:0.1.3
1532

16-
## 0.1.1
17-
- Upgrade baseimage: experimental-light-baseimage:0.1.3
33+
## 0.1.0 - 2016-02-20
34+
Initial release
1835

19-
## 0.1.0
20-
- Initial release
36+
[0.2.2]: https://github.com/osixia/docker-tinc/compare/v0.2.1...v0.2.2
37+
[0.2.1]: https://github.com/osixia/docker-tinc/compare/v0.2.0...v0.2.1
38+
[0.2.0]: https://github.com/osixia/docker-tinc/compare/v0.1.4...v0.2.0
39+
[0.1.4]: https://github.com/osixia/docker-tinc/compare/v0.1.3...v0.1.4
40+
[0.1.3]: https://github.com/osixia/docker-tinc/compare/v0.1.2...v0.1.3
41+
[0.1.2]: https://github.com/osixia/docker-tinc/compare/v0.1.1...v0.1.2
42+
[0.1.1]: https://github.com/osixia/docker-tinc/compare/v0.1.0...v0.1.1

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = osixia/tinc
2-
VERSION = 0.2.1
2+
VERSION = 0.2.2
33

44
.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
55

image/Dockerfile

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
# Use osixia/light-baseimage
22
# sources: https://github.com/osixia/docker-light-baseimage
33
FROM osixia/light-baseimage:1.1.0
4-
MAINTAINER Bertrand Gouny <[email protected]>
54

65
# Tinc version
76
ARG TINC_VERSION=1.1pre15
87

98
# Download, build and install Tinc
109
RUN apt-get -y update \
1110
&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
12-
ca-certificates \
13-
curl \
11+
ca-certificates \
12+
curl \
1413
gcc \
1514
libssl1.1 \
1615
libssl-dev \
1716
liblzo2-2 \
1817
liblzo2-dev \
1918
libncurses5 \
20-
libncurses5-dev \
19+
libncurses5-dev \
2120
libreadline7 \
22-
libreadline-dev \
21+
libreadline-dev \
2322
make \
2423
pkg-config \
2524
zlib1g \
26-
zlib1g-dev \
25+
zlib1g-dev \
2726
&& curl -o tinc.tar.gz -SL https://www.tinc-vpn.org/packages/tinc-${TINC_VERSION}.tar.gz \
2827
&& mkdir -p /container/tinc-sources \
2928
&& tar -xzf tinc.tar.gz --strip 1 -C /container/tinc-sources \
@@ -33,7 +32,7 @@ RUN apt-get -y update \
3332
&& cd - \
3433
&& mkdir -p /usr/local/var/run/ \
3534
&& apt-get remove -y --purge --auto-remove ca-certificates curl gcc \
36-
libssl-dev liblzo2-dev libncurses5-dev libreadline-dev make pkg-config zlib1g-dev \
35+
libssl-dev liblzo2-dev libncurses5-dev libreadline-dev make pkg-config zlib1g-dev \
3736
&& rm -f tinc.tar.gz \
3837
&& rm -rf /container/tinc-sources \
3938
&& apt-get clean \

0 commit comments

Comments
 (0)