update pptp

pptp/Dockerfile

@@ -2,8 +2,8 @@
 # Dockerfile for pptp
 #
 
-FROM alpine:edge
+FROM alpine:3
-MAINTAINER kev <noreply@easypi.pro>
+MAINTAINER EasyPi Software Foundation
 
 RUN apk add --no-cache \
             --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \

pptp/Dockerfile.debian

@@ -2,8 +2,8 @@
 # Dockerfile for pptp
 #
 
-FROM debian
+FROM debian:bookworm
-MAINTAINER kev <noreply@easypi.pro>
+MAINTAINER EasyPi Software Foundation
 
 RUN set -xe \
     && apt-get update \

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 ipinfo.io
-curl ifconfig.ovh
-curl ifconfig.me
 ```
 
 ## references

pptp/arm/Dockerfile

@@ -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"]

pptp/arm/docker-compose.yml

@@ -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

pptp/arm/docker-entrypoint.sh

@@ -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 "$@"

pptp/docker-compose.yml

@@ -1,10 +1,12 @@
-pptp:
+version: "3.8"
-  image: vimagick/pptp
+services:
-  environment:
+  pptp:
-    - SERVER=192.168.31.222
+    image: vimagick/pptp
-    - TUNNEL=vps
+    environment:
-    - USERNAME=username
+      - SERVER=192.168.31.222
-    - PASSWORD=password
+      - TUNNEL=vps
-  net: host
+      - USERNAME=username
-  privileged: yes
+      - PASSWORD=password
-  restart: unless-stopped
+    network_mode: host
+    privileged: true
+    restart: unless-stopped

pptp/docker-entrypoint.sh

@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# helper for vimagick/pptp
+#
 
 cat > /etc/ppp/peers/${TUNNEL} <<_EOF_
 pty "pptp ${SERVER} --nolaunchpppd"