From 566f5c6742d3695b6fef23a709e730e84f9588be Mon Sep 17 00:00:00 2001 From: kev Date: Fri, 19 Aug 2022 17:30:44 +0800 Subject: [PATCH] update openconnect (FIX #201) --- openconnect/Dockerfile | 7 ++----- openconnect/README.md | 13 ------------- openconnect/arm/Dockerfile | 19 ------------------- openconnect/arm/docker-compose.yml | 9 --------- openconnect/docker-compose.yml | 20 +++++++++++--------- 5 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 openconnect/arm/Dockerfile delete mode 100644 openconnect/arm/docker-compose.yml diff --git a/openconnect/Dockerfile b/openconnect/Dockerfile index 8d6d27b..5eb3a82 100644 --- a/openconnect/Dockerfile +++ b/openconnect/Dockerfile @@ -2,14 +2,11 @@ # Dockerfile for openconnect # -FROM alpine:3.12 +FROM alpine:3 MAINTAINER EasyPi Software Foundation RUN set -xe \ - && apk add --no-cache nettle \ - && apk add --no-cache \ - --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ \ - openconnect \ + && apk add --no-cache nettle openconnect \ && mkdir -p /etc/openconnect \ && touch /etc/openconnect/openconnect.conf diff --git a/openconnect/README.md b/openconnect/README.md index 79a17ad..be77d63 100644 --- a/openconnect/README.md +++ b/openconnect/README.md @@ -7,19 +7,6 @@ openconnect AnyConnect SSL VPN. It has since been ported to support the Juniper SSL VPN which is now known as Pulse Connect Secure. -## docker-compose.yml - -```yaml -openconnect: - image: vimagick/openconnect - command: https://vpn.easypi.info:4443 - net: host - volumes: - - ./data:/etc/openconnect - stop_signal: SIGINT - privileged: yes -``` - ## up and running ```bash diff --git a/openconnect/arm/Dockerfile b/openconnect/arm/Dockerfile deleted file mode 100644 index 6d34201..0000000 --- a/openconnect/arm/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -# -# Dockerfile for openconnect-arm -# - -FROM arm32v7/alpine:3.12 -MAINTAINER EasyPi Software Foundation - -RUN set -xe \ - && apk add --no-cache nettle \ - && apk add --no-cache \ - --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ \ - openconnect \ - && mkdir -p /etc/openconnect \ - && touch /etc/openconnect/openconnect.conf - -VOLUME /etc/openconnect - -ENTRYPOINT ["openconnect", "--config=/etc/openconnect/openconnect.conf"] -CMD ["--help"] diff --git a/openconnect/arm/docker-compose.yml b/openconnect/arm/docker-compose.yml deleted file mode 100644 index 382e664..0000000 --- a/openconnect/arm/docker-compose.yml +++ /dev/null @@ -1,9 +0,0 @@ -openconnect: - image: easypi/openconnect-arm - command: https://vpn.easypi.info:4443 - net: host - volumes: - - ./data:/etc/openconnect - stop_signal: SIGINT - privileged: yes - restart: unless-stopped diff --git a/openconnect/docker-compose.yml b/openconnect/docker-compose.yml index 7f70712..7467554 100644 --- a/openconnect/docker-compose.yml +++ b/openconnect/docker-compose.yml @@ -1,9 +1,11 @@ -openconnect: - image: vimagick/openconnect - command: https://vpn.easypi.info:4443 - net: host - volumes: - - ./data:/etc/openconnect - stop_signal: SIGINT - privileged: yes - restart: unless-stopped +version: "3.8" +services: + openconnect: + image: vimagick/openconnect + command: https://vpn.easypi.duckdns.org:4443 + volumes: + - ./data:/etc/openconnect + network_mode: host + stop_signal: SIGINT + privileged: true + restart: unless-stopped