From d5a2ed04bf4650b8debd917ffd7beb04b649610f Mon Sep 17 00:00:00 2001 From: Jean-Christophe Hoelt Date: Wed, 13 Feb 2019 08:47:11 +0000 Subject: [PATCH 1/3] Fix apt installation Proper fix should be in the debian file, but in the meantime... --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index e5d3970..891830f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ MAINTAINER Jens Erat RUN for i in `find / -perm +6000 -type f 2>/dev/null`; do chmod a-s $i; done RUN echo "deb http://http.debian.net/debian experimental main" >> /etc/apt/sources.list && \ + mkdir -p /etc/tinc/nets.boot && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y net-tools && \ DEBIAN_FRONTEND=noninteractive apt-get install -y -t experimental tinc && \ From 55b7329e420872273204fc26c67c1fc920dd923e Mon Sep 17 00:00:00 2001 From: Jean-Christophe Hoelt Date: Fri, 21 Feb 2020 08:24:44 +0000 Subject: [PATCH 2/3] Build the tinc package from source in debian stable --- Dockerfile | 16 +++++++++++----- README.md | 5 ++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 891830f..1d2ee44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,20 @@ -FROM debian:experimental -MAINTAINER Jens Erat +FROM debian +MAINTAINER Jean-Christophe Hoelt + +ENV TINC_VERSION=1.1~pre17-1.1 # Remove SUID programs RUN for i in `find / -perm +6000 -type f 2>/dev/null`; do chmod a-s $i; done -RUN echo "deb http://http.debian.net/debian experimental main" >> /etc/apt/sources.list && \ +RUN \ + export DEBIAN_FRONTEND=noninteractive && \ mkdir -p /etc/tinc/nets.boot && \ + echo "deb-src http://httpredir.debian.org/debian/ experimental main contrib non-free" >> /etc/apt/sources.list && \ apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y net-tools && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y -t experimental tinc && \ + apt-get install -y net-tools && \ + apt-get build-dep -y tinc=${TINC_VERSION} && \ + apt-get source --compile tinc=${TINC_VERSION} && \ + dpkg -i tinc_${TINC_VERSION}_amd64.deb && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* EXPOSE 655/tcp 655/udp diff --git a/README.md b/README.md index ee60b65..59bb8aa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # tinc for Docker -Dockerfile (c) 2015 Jens Erat, email@jenserat.de +Dockerfile (c) 2015 Jens Erat, email@jenserat.de + +Contributor: Jean-Christophe Hoelt + Licensed under BSD license > [tinc](http://www.tinc-vpn.org) is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. From d0f26d264dc375134fcbe999aeec15d1501e4d89 Mon Sep 17 00:00:00 2001 From: Florian Jensen Date: Wed, 30 Sep 2020 22:54:11 +0200 Subject: [PATCH 3/3] Bump tinc version to 1.1~pre17-1.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1d2ee44..56e60aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian MAINTAINER Jean-Christophe Hoelt -ENV TINC_VERSION=1.1~pre17-1.1 +ENV TINC_VERSION=1.1~pre17-1.2 # Remove SUID programs RUN for i in `find / -perm +6000 -type f 2>/dev/null`; do chmod a-s $i; done