Skip to content
This repository was archived by the owner on Jan 17, 2020. It is now read-only.

Commit 90eec4f

Browse files
author
Antoine Mary
committed
Correcting non binding port
1 parent bedaf4c commit 90eec4f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ ENV LANG="en_US.UTF-8" \
77

88
### SETUP
99
COPY assets /assets
10-
RUN apk update && apk upgrade && \
11-
apk add wget make gcc musl-dev readline-dev openssl-dev ncurses-dev su-exec && \
10+
RUN apk add --no-cache wget make gcc musl-dev readline-dev openssl-dev ncurses-dev libcap su-exec && \
1211
addgroup softether && adduser -g 'softether' -G softether -s /sbin/nologin -D -H softether && \
1312
mv /assets/entrypoint.sh / && chmod +x /entrypoint.sh && \
1413

@@ -24,12 +23,12 @@ RUN apk update && apk upgrade && \
2423
# Cleanning
2524
apk del wget make gcc musl-dev readline-dev openssl-dev ncurses-dev && \
2625
# Reintroduce necessary libraries
27-
apk add libssl1.0 libcrypto1.0 readline ncurses-libs && \
26+
apk add --no-cache libssl1.0 libcrypto1.0 readline ncurses-libs && \
2827
# Removing vpnbridge, vpnclient, vpncmd and build files
29-
cd .. && rm -rf /usr/vpnbridge /usr/bin/vpnbridge /usr/vpnclient /usr/bin/vpnclient /usr/vpncmd /usr/bin/vpncmd \
30-
/var/cache/apk/* /assets SoftEtherVPN-${SOFTETHER_VERSION:1}
28+
cd .. && rm -rf /usr/vpnbridge /usr/bin/vpnbridge /usr/vpnclient /usr/bin/vpnclient /usr/vpncmd /usr/bin/vpncmd /usr/bin/vpnserver \
29+
/assets SoftEtherVPN-${SOFTETHER_VERSION:1}
3130

3231
EXPOSE 443/tcp 992/tcp 1194/udp 5555/tcp
3332

3433
ENTRYPOINT ["/entrypoint.sh"]
35-
CMD ["vpnserver", "execsvc"]
34+
CMD ["/usr/vpnserver/vpnserver", "execsvc"]

assets/entrypoint.sh

100644100755
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/bin/sh
22
set -e
33

4-
if [ "$1" = 'vpnserver' ]; then
5-
chown -R softether /usr/vpnserver
4+
if [ "$1" = '/usr/vpnserver/vpnserver' ]; then
5+
chown -R softether:softether /usr/vpnserver
6+
setcap 'cap_net_bind_service=+ep' /usr/vpnserver/vpnserver
7+
68
echo "Starting SoftEther VPN Server"
7-
exec su-exec softether "$@"
8-
echo "Starting SoftEther VPN Started"
9+
exec su-exec softether sh -c "`echo $@`"
910
else
1011
exec "$@"
1112
fi

0 commit comments

Comments
 (0)