diff --git a/tinc/Dockerfile b/tinc/Dockerfile index f5c0f67..2179571 100644 --- a/tinc/Dockerfile +++ b/tinc/Dockerfile @@ -2,7 +2,7 @@ # Dockerfile for tinc # -FROM debian:jessie +FROM alpine MAINTAINER kev ENV NETNAME netname @@ -13,18 +13,17 @@ ENV ADDRESS 10.0.0.1 ENV NETMASK 255.255.255.0 ENV NETWORK 10.0.0.0/24 -RUN apt-get update \ - && apt-get install -y iptables net-tools tinc \ - && rm -rf /var/lib/apt/lists/* \ +RUN apk add -U iptables tinc \ + && rm -rf /var/cache/apk/* \ && mkdir -p /etc/tinc/$NETNAME/hosts WORKDIR /etc/tinc/$NETNAME -RUN /bin/echo -e "Name=server\\nAddressFamily=ipv4\\nInterface=tun0" > tinc.conf \ - && /bin/echo -e "Subnet=$ADDRESS\\nSubnet=0.0.0.0/0" > hosts/server \ - && /bin/echo -e "\\n" | tincd -n $NETNAME -K4096 \ - && /bin/echo -e "ifconfig \$INTERFACE $ADDRESS netmask $NETMASK" > tinc-up \ - && /bin/echo -e "ifconfig \$INTERFACE down" > tinc-down \ +RUN echo -e "Name=server\\nAddressFamily=ipv4\\nInterface=tun0" > tinc.conf \ + && echo -e "Subnet=$ADDRESS\\nSubnet=0.0.0.0/0" > hosts/server \ + && echo -e "\\n" | tincd -n $NETNAME -K4096 \ + && echo -e "ifconfig \$INTERFACE $ADDRESS netmask $NETMASK" > tinc-up \ + && echo -e "ifconfig \$INTERFACE down" > tinc-down \ && chmod +x tinc-up tinc-down VOLUME /etc/tinc diff --git a/tinc/Dockerfile.debian b/tinc/Dockerfile.debian new file mode 100644 index 0000000..f5c0f67 --- /dev/null +++ b/tinc/Dockerfile.debian @@ -0,0 +1,40 @@ +# +# Dockerfile for tinc +# + +FROM debian:jessie +MAINTAINER kev + +ENV NETNAME netname +ENV PIDFILE /run/tinc.$NETNAME.pid +ENV VERBOSE 2 + +ENV ADDRESS 10.0.0.1 +ENV NETMASK 255.255.255.0 +ENV NETWORK 10.0.0.0/24 + +RUN apt-get update \ + && apt-get install -y iptables net-tools tinc \ + && rm -rf /var/lib/apt/lists/* \ + && mkdir -p /etc/tinc/$NETNAME/hosts + +WORKDIR /etc/tinc/$NETNAME + +RUN /bin/echo -e "Name=server\\nAddressFamily=ipv4\\nInterface=tun0" > tinc.conf \ + && /bin/echo -e "Subnet=$ADDRESS\\nSubnet=0.0.0.0/0" > hosts/server \ + && /bin/echo -e "\\n" | tincd -n $NETNAME -K4096 \ + && /bin/echo -e "ifconfig \$INTERFACE $ADDRESS netmask $NETMASK" > tinc-up \ + && /bin/echo -e "ifconfig \$INTERFACE down" > tinc-down \ + && chmod +x tinc-up tinc-down + +VOLUME /etc/tinc +EXPOSE 655/tcp 655/udp + +CMD mkdir -p /dev/net \ + && [ -e /dev/net/tun ] || mknod /dev/net/tun c 10 200 \ + && iptables -t nat -A POSTROUTING -s $NETWORK -o eth0 -j MASQUERADE \ + && tincd --no-detach \ + --net $NETNAME \ + --pidfile $PIDFILE \ + --debug $VERBOSE +