From ea8ba66736d5ab6eb5f4cd35bf13c34c56a08ad7 Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 9 Feb 2023 01:22:17 +0300 Subject: [PATCH] Update Dockerfile to be compatible with latest alpine image, update README --- README.md | 6 ++++-- build/Dockerfile | 16 +++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index d20ec8f..23d737e 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,9 @@ set the environment variables in a `.env` file: OPENCONNECT_PASSWORD= OPENCONNECT_OPTIONS=--authgroup \ --servercert --protocol= \ - --reconnect-timeout 86400 + --reconnect-timeout 86400 \ + --allow-insecure-crypto \ + --servercert _Don't use quotes around the values!_ @@ -120,7 +122,7 @@ or (depending on your ncat version) and your connection will be passed through the proxy. The above example is for using git with ssh keys. -## corkscrew +## corkscrew An alternative is _corkscrew_ (e.g. install with `brew install corkscrew` on mac OS) diff --git a/build/Dockerfile b/build/Dockerfile index 1343d19..072489e 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:latest MAINTAINER Wolfgang Klinger RUN apk add --no-cache libcrypto1.1 libssl1.1 libstdc++ --repository http://dl-cdn.alpinelinux.org/alpine/edge/main @@ -9,19 +9,17 @@ RUN apk add --no-cache openconnect tinyproxy --repository http://dl-cdn.alpineli RUN apk add --no-cache ca-certificates wget \ && wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \ - && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-2.30-r0.apk \ - && apk add --no-cache --virtual .build-deps glibc-2.30-r0.apk gcc make musl-dev \ + && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \ + && apk add --force-overwrite --no-cache --virtual .build-deps glibc-2.35-r0.apk gcc make musl-dev \ && cd /tmp \ - && wget https://github.com/rofl0r/microsocks/archive/v1.0.1.tar.gz \ - && tar -xzvf v1.0.1.tar.gz \ - && cd microsocks-1.0.1 \ + && wget https://github.com/rofl0r/microsocks/archive/v1.0.3.tar.gz \ + && tar -xzvf v1.0.3.tar.gz \ + && cd microsocks-1.0.3 \ && make \ && make install \ # add vpn-slice with dependencies (dig) https://github.com/dlenski/vpn-slice - && apk add --no-cache python3 bind-tools && pip3 install --upgrade pip \ + && apk add --no-cache python3 py3-pip bind-tools && pip3 install --upgrade pip \ && pip3 install https://github.com/dlenski/vpn-slice/archive/master.zip \ - # always add the docker DNS server - && grep -qxF 'nameserver 127.0.0.11' /etc/resolv.conf || echo 'nameserver 127.0.0.11' >> /etc/resolv.conf \ && apk del .build-deps wget # Use an up-to-date version of vpnc-script