diff --git a/pptp/Dockerfile b/pptp/Dockerfile index 1ce667a..8afaf6a 100644 --- a/pptp/Dockerfile +++ b/pptp/Dockerfile @@ -2,8 +2,8 @@ # Dockerfile for pptp # -FROM alpine:edge -MAINTAINER kev +FROM alpine:3 +MAINTAINER EasyPi Software Foundation RUN apk add --no-cache \ --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \ diff --git a/pptp/Dockerfile.debian b/pptp/Dockerfile.debian index af62206..12eea0a 100644 --- a/pptp/Dockerfile.debian +++ b/pptp/Dockerfile.debian @@ -2,8 +2,8 @@ # Dockerfile for pptp # -FROM debian -MAINTAINER kev +FROM debian:bookworm +MAINTAINER EasyPi Software Foundation RUN set -xe \ && apt-get update \ diff --git a/pptp/README.md b/pptp/README.md index 4c367a1..9e758ef 100644 --- a/pptp/README.md +++ b/pptp/README.md @@ -3,21 +3,6 @@ pptp Containerized PPTP Client -## docker-compose.yml - -```yaml -pptp: - image: vimagick/pptp - environment: - - SERVER=1.2.3.4 - - TUNNEL=vps - - USERNAME=username - - PASSWORD=password - net: host - privileged: yes - restart: unless-stopped -``` - ## up and running ``` @@ -30,9 +15,7 @@ ip link show ip addr show ip route show -curl ifconfig.co -curl ifconfig.ovh -curl ifconfig.me +curl ipinfo.io ``` ## references diff --git a/pptp/arm/Dockerfile b/pptp/arm/Dockerfile deleted file mode 100644 index 382712d..0000000 --- a/pptp/arm/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -# -# Dockerfile for pptp-arm -# - -FROM easypi/alpine-arm:edge -MAINTAINER EasyPi Software Foundation - -RUN apk add --no-cache \ - --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \ - pptpclient - -COPY docker-entrypoint.sh /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/pptp/arm/docker-compose.yml b/pptp/arm/docker-compose.yml deleted file mode 100644 index 90d3b4d..0000000 --- a/pptp/arm/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -pptp: - image: easypi/pptp-arm - environment: - - SERVER=192.168.31.222 - - TUNNEL=vps - - USERNAME=username - - PASSWORD=password - net: host - privileged: yes - restart: unless-stopped diff --git a/pptp/arm/docker-entrypoint.sh b/pptp/arm/docker-entrypoint.sh deleted file mode 100755 index dcff73c..0000000 --- a/pptp/arm/docker-entrypoint.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -cat > /etc/ppp/peers/${TUNNEL} <<_EOF_ -pty "pptp ${SERVER} --nolaunchpppd" -name "${USERNAME}" -password "${PASSWORD}" -remotename PPTP -require-mppe-128 -file /etc/ppp/options.pptp -ipparam "${TUNNEL}" -_EOF_ - -cat > /etc/ppp/ip-up <<"_EOF_" -#!/bin/sh -ip route add 0.0.0.0/1 dev $1 -ip route add 128.0.0.0/1 dev $1 -_EOF_ - -cat > /etc/ppp/ip-down <<"_EOF_" -#!/bin/sh -ip route del 0.0.0.0/1 dev $1 -ip route del 128.0.0.0/1 dev $1 -_EOF_ - -exec pon ${TUNNEL} debug dump logfd 2 nodetach persist "$@" diff --git a/pptp/docker-compose.yml b/pptp/docker-compose.yml index d0602b2..7319f86 100644 --- a/pptp/docker-compose.yml +++ b/pptp/docker-compose.yml @@ -1,10 +1,12 @@ -pptp: - image: vimagick/pptp - environment: - - SERVER=192.168.31.222 - - TUNNEL=vps - - USERNAME=username - - PASSWORD=password - net: host - privileged: yes - restart: unless-stopped +version: "3.8" +services: + pptp: + image: vimagick/pptp + environment: + - SERVER=192.168.31.222 + - TUNNEL=vps + - USERNAME=username + - PASSWORD=password + network_mode: host + privileged: true + restart: unless-stopped diff --git a/pptp/docker-entrypoint.sh b/pptp/docker-entrypoint.sh index dcff73c..07216f5 100755 --- a/pptp/docker-entrypoint.sh +++ b/pptp/docker-entrypoint.sh @@ -1,4 +1,7 @@ #!/bin/sh +# +# helper for vimagick/pptp +# cat > /etc/ppp/peers/${TUNNEL} <<_EOF_ pty "pptp ${SERVER} --nolaunchpppd"