Skip to content

Update Dockerfile to be compatible with latest alpine image, update README #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sfedosimov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Dockerfile to be compatible with latest alpine image, update README #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ set the environment variables in a `.env` file:
OPENCONNECT_PASSWORD=<Password>
OPENCONNECT_OPTIONS=--authgroup <VPN Group> \
--servercert <VPN Server Certificate> --protocol=<Protocol> \
--reconnect-timeout 86400
--reconnect-timeout 86400 \
--allow-insecure-crypto \
--servercert <servercert>

_Don't use quotes around the values!_

Expand Down Expand Up @@ -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)

Expand Down
16 changes: 7 additions & 9 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:edge
FROM alpine:latest
MAINTAINER Wolfgang Klinger <wolfgang@wazum.com>

RUN apk add --no-cache libcrypto1.1 libssl1.1 libstdc++ --repository http://dl-cdn.alpinelinux.org/alpine/edge/main
Expand All @@ -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
Expand Down