Merge pull request #93 from siomiz/9754

MAINT(all): v4.36-9754-beta

Dockerfile

@@ -1,10 +1,10 @@
-FROM alpine:3.12 as prep
+FROM alpine:3.14 as prep
 
 LABEL maintainer="Tomohisa Kusano <[email protected]>" \
       contributors="See CONTRIBUTORS file <https://github.com/siomiz/SoftEtherVPN/blob/master/CONTRIBUTORS>"
 
-ENV BUILD_VERSION=4.34-9745-beta \
-    SHA256_SUM=a2d7951f4fafcef96ab8341a948a8d09ca02030e4161c5e90a34882aa8b34224
+ENV BUILD_VERSION=4.36-9754-beta \
+    SHA256_SUM=6caec01178bdb971705ce8d5524af6f3b696e6fe1965f7c93a77d11e28fa3f0e
 
 RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \
     && echo "${SHA256_SUM}  v${BUILD_VERSION}.tar.gz" | sha256sum -c \

Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM alpine:3.12 as prep
+FROM alpine:3.14 as prep
 
 LABEL maintainer="Tomohisa Kusano <[email protected]>" \
       contributors="See CONTRIBUTORS file <https://github.com/siomiz/SoftEtherVPN/blob/master/CONTRIBUTORS>"
@@ -12,7 +12,7 @@ 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.12 as build
+FROM alpine:3.14 as build
 
 COPY --from=prep /usr/local/src /usr/local/src
 
@@ -26,7 +26,7 @@ RUN apk add -U build-base ncurses-dev openssl-dev readline-dev zip zlib-dev \
     && touch /usr/vpnserver/vpn_server.config \
     && zip -r9 /artifacts.zip /usr/vpn* /usr/bin/vpn*
 
-FROM alpine:3.12
+FROM alpine:3.14
 
 COPY --from=build /artifacts.zip /
 

Dockerfile.debian

@@ -1,10 +1,10 @@
-FROM alpine:3.12 as prep
+FROM alpine:3.14 as prep
 
 LABEL maintainer="Tomohisa Kusano <[email protected]>" \
       contributors="See CONTRIBUTORS file <https://github.com/siomiz/SoftEtherVPN/blob/master/CONTRIBUTORS>"
 
-ENV BUILD_VERSION=4.34-9745-beta \
-    SHA256_SUM=a2d7951f4fafcef96ab8341a948a8d09ca02030e4161c5e90a34882aa8b34224
+ENV BUILD_VERSION=4.36-9754-beta \
+    SHA256_SUM=6caec01178bdb971705ce8d5524af6f3b696e6fe1965f7c93a77d11e28fa3f0e
 
 RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \
     && echo "${SHA256_SUM}  v${BUILD_VERSION}.tar.gz" | sha256sum -c \

Dockerfile.ubuntu

@@ -1,10 +1,10 @@
-FROM alpine:3.12 as prep
+FROM alpine:3.14 as prep
 
 LABEL maintainer="Tomohisa Kusano <[email protected]>" \
       contributors="See CONTRIBUTORS file <https://github.com/siomiz/SoftEtherVPN/blob/master/CONTRIBUTORS>"
 
-ENV BUILD_VERSION=4.34-9745-beta \
-    SHA256_SUM=a2d7951f4fafcef96ab8341a948a8d09ca02030e4161c5e90a34882aa8b34224
+ENV BUILD_VERSION=4.36-9754-beta \
+    SHA256_SUM=6caec01178bdb971705ce8d5524af6f3b696e6fe1965f7c93a77d11e28fa3f0e
 
 RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \
     && echo "${SHA256_SUM}  v${BUILD_VERSION}.tar.gz" | sha256sum -c \

README.md

@@ -5,12 +5,12 @@
 <sup>*</sup> "Simple" as in no configuration parameter is needed for a single-user SecureNAT setup.
 
 ## Image Tags
-Base OS Image | Latest Stable ([v4.34-9745-beta](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/tree/v4.34-9745-beta)) | Previous Base | [v4.29-9680-rtm](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/tree/v4.29-9680-rtm)
+Base OS Image | Latest Stable ([v4.36-9754-beta](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/tree/v4.36-9754-beta)) | Previous Base | [v4.29-9680-rtm](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/tree/v4.29-9680-rtm)
 ------------- | -- | -- | --
-`centos:8` | **`:latest`**, `:centos`, `:9745`, `:4.34`, `:9745-centos`, `:4.34-centos` | `centos:7` | `:9680`, `:4.29`, `:9680-centos`, `4.29-centos`
-`debian:10-slim` | `:debian`, `:9745-debian`, `:4.34-debian` | `debian:10-slim` | `:9680-debian`, `:4.29-debian`
-`alpine:3.12` | `:alpine`, `:9745-alpine`, `:4.34-alpine` | `alpine:3.9` | `:9680-alpine`, `:4.29-alpine`
-`ubuntu:20.04` | `:ubuntu`, `:9745-ubuntu`, `:4.34-ubuntu` | `ubuntu:18.04` | `:9680-ubuntu`, `:4.29-ubuntu`
+`centos:8` | **`:latest`**, `:centos`, `:9754`, `:4.36`, `:9754-centos`, `:4.36-centos` | `centos:7` | `:9680`, `:4.29`, `:9680-centos`, `4.29-centos`
+`debian:10-slim` | `:debian`, `:9754-debian`, `:4.36-debian` | `debian:10-slim` | `:9680-debian`, `:4.29-debian`
+`alpine:3.14` | `:alpine`, `:9754-alpine`, `:4.36-alpine` | `alpine:3.9` | `:9680-alpine`, `:4.29-alpine`
+`ubuntu:20.04` | `:ubuntu`, `:9754-ubuntu`, `:4.36-ubuntu` | `ubuntu:18.04` | `:9680-ubuntu`, `:4.29-ubuntu`
 
 ## Setup
  - L2TP/IPSec PSK + OpenVPN

push-tags.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -x
 
-SE_VERSION="4.34"
-SE_REVISION="9745"
+SE_VERSION="4.36"
+SE_REVISION="9754"
 
 BASE_TAGS="latest centos debian alpine ubuntu"
 

tests/prepare-ipsec.sh

@@ -62,6 +62,6 @@ EOF
 mkdir -p /var/run/xl2tpd
 touch /var/run/xl2tpd/l2tp-control
 
-service strongswan restart
+service ipsec restart
 service xl2tpd restart