diff --git a/Dockerfile b/Dockerfile index 7875be01..6a42ddcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM alpine:3.7 as prep +FROM alpine:3.9 as prep LABEL maintainer="Tomohisa Kusano " \ contributors="See CONTRIBUTORS file " -ENV BUILD_VERSION=4.28-9669-beta \ - SHA256_SUM=fbf6e04c4451d0cb1555c3a53c178b5453c7d761119f82fd693538c9f115fecb +ENV BUILD_VERSION=4.29-9680-rtm \ + SHA256_SUM=c19cd49835c613cb5551ce66c91f90da3d3496ab3e15e8c61e22b464dc55d9b0 RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \ && echo "${SHA256_SUM} v${BUILD_VERSION}.tar.gz" | sha256sum -c \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index d677b616..c3212dba 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,10 +1,10 @@ -FROM alpine:3.7 as prep +FROM alpine:3.9 as prep LABEL maintainer="Tomohisa Kusano " \ contributors="See CONTRIBUTORS file " -ENV BUILD_VERSION=4.28-9669-beta \ - SHA256_SUM=fbf6e04c4451d0cb1555c3a53c178b5453c7d761119f82fd693538c9f115fecb +ENV BUILD_VERSION=4.29-9680-rtm \ + SHA256_SUM=c19cd49835c613cb5551ce66c91f90da3d3496ab3e15e8c61e22b464dc55d9b0 RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \ && echo "${SHA256_SUM} v${BUILD_VERSION}.tar.gz" | sha256sum -c \ @@ -12,13 +12,13 @@ RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VE && tar -x -C /usr/local/src/ -f v${BUILD_VERSION}.tar.gz \ && rm v${BUILD_VERSION}.tar.gz -FROM alpine:3.7 as build +FROM alpine:3.9 as build COPY --from=prep /usr/local/src /usr/local/src ENV LANG=en_US.UTF-8 -RUN apk add -U build-base ncurses-dev openssl-dev readline-dev zip \ +RUN apk add -U build-base ncurses-dev openssl-dev readline-dev zip zlib-dev \ && cd /usr/local/src/SoftEtherVPN_Stable-* \ && ./configure \ && make \ @@ -26,7 +26,7 @@ RUN apk add -U build-base ncurses-dev openssl-dev readline-dev zip \ && touch /usr/vpnserver/vpn_server.config \ && zip -r9 /artifacts.zip /usr/vpn* /usr/bin/vpn* -FROM alpine:3.7 +FROM alpine:3.9 COPY --from=build /artifacts.zip / diff --git a/Dockerfile.debian b/Dockerfile.debian index 6e2ca002..7f584cae 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -1,10 +1,10 @@ -FROM alpine:3.7 as prep +FROM alpine:3.9 as prep LABEL maintainer="Tomohisa Kusano " \ contributors="See CONTRIBUTORS file " -ENV BUILD_VERSION=4.28-9669-beta \ - SHA256_SUM=fbf6e04c4451d0cb1555c3a53c178b5453c7d761119f82fd693538c9f115fecb +ENV BUILD_VERSION=4.29-9680-rtm \ + SHA256_SUM=c19cd49835c613cb5551ce66c91f90da3d3496ab3e15e8c61e22b464dc55d9b0 RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \ && echo "${SHA256_SUM} v${BUILD_VERSION}.tar.gz" | sha256sum -c \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 1f725c5d..3d5f7ab6 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -3,8 +3,8 @@ FROM alpine:3.7 as prep LABEL maintainer="Tomohisa Kusano " \ contributors="See CONTRIBUTORS file " -ENV BUILD_VERSION=4.28-9669-beta \ - SHA256_SUM=fbf6e04c4451d0cb1555c3a53c178b5453c7d761119f82fd693538c9f115fecb +ENV BUILD_VERSION=4.29-9680-rtm \ + SHA256_SUM=c19cd49835c613cb5551ce66c91f90da3d3496ab3e15e8c61e22b464dc55d9b0 RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \ && echo "${SHA256_SUM} v${BUILD_VERSION}.tar.gz" | sha256sum -c \ diff --git a/README.md b/README.md index e7219b8a..249a8c77 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ * "Simple" as in no configuration parameter is needed for a single-user SecureNAT setup. ## Image Tags -Base OS Image | Latest Stable ([v4.28-9669-beta](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/tree/v4.28-9669-beta)) | [v4.25-9656-rtm](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/tree/v4.25-9656-rtm) +Base OS Image | Latest Stable ([v4.29-9680-rtm](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/tree/v4.29-9680-rtm)) | [v4.25-9656-rtm](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/tree/v4.25-9656-rtm) ------------- | -- | -- -`centos:7` | **`:latest`**, `:centos`, `:9669`, `:4.28`, `:9669-centos`, `:4.28-centos` | `:9656`, `:4.25`, `:9656-centos`, `4.25-centos` -`debian:9-slim` | `:debian`, `:9669-debian`, `:4.28-debian` | `:9656-debian`, `:4.25-debian` -`alpine:3.7` | `:alpine`, `:9669-alpine`, `:4.28-alpine` | `:9656-alpine`, `:4.25-alpine` -`ubuntu:18.04` | `:ubuntu`, `:9669-ubuntu`, `:4.28-ubuntu` | - +`centos:7` | **`:latest`**, `:centos`, `:9680`, `:4.29`, `:9680-centos`, `:4.29-centos` | `:9656`, `:4.25`, `:9656-centos`, `4.25-centos` +`debian:9-slim` | `:debian`, `:9680-debian`, `:4.29-debian` | `:9656-debian`, `:4.25-debian` +`alpine:3.9` | `:alpine`, `:9680-alpine`, `:4.29-alpine` | `:9656-alpine`, `:4.25-alpine` +`ubuntu:18.04` | `:ubuntu`, `:9680-ubuntu`, `:4.29-ubuntu` | - ## Setup - L2TP/IPSec PSK + OpenVPN