Skip to content

Commit

Permalink
Merge pull request #84 from siomiz/9745
Browse files Browse the repository at this point in the history 
MAINT(all): v4.34-9745-beta
  • Loading branch information
@siomiz
siomiz authored Jul 15, 2020
2 parents 1fa0012 + d012031 commit ce5ea38
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 33 deletions.
14 changes: 7 additions & 7 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM alpine:3.9 as prep
FROM alpine:3.12 as prep

LABEL maintainer="Tomohisa Kusano <[email protected]>" \
contributors="See CONTRIBUTORS file <https://github.com/siomiz/SoftEtherVPN/blob/master/CONTRIBUTORS>"

ENV BUILD_VERSION=4.29-9680-rtm \
SHA256_SUM=c19cd49835c613cb5551ce66c91f90da3d3496ab3e15e8c61e22b464dc55d9b0
ENV BUILD_VERSION=4.34-9745-beta \
SHA256_SUM=a2d7951f4fafcef96ab8341a948a8d09ca02030e4161c5e90a34882aa8b34224

RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \
&& echo "${SHA256_SUM} v${BUILD_VERSION}.tar.gz" | sha256sum -c \
&& mkdir -p /usr/local/src \
&& tar -x -C /usr/local/src/ -f v${BUILD_VERSION}.tar.gz \
&& rm v${BUILD_VERSION}.tar.gz

FROM centos:7 as build
FROM centos:8 as build

COPY --from=prep /usr/local/src /usr/local/src

Expand All @@ -26,14 +26,14 @@ RUN yum -y update \
&& touch /usr/vpnserver/vpn_server.config \
&& zip -r9 /artifacts.zip /usr/vpn* /usr/bin/vpn*

FROM centos:7
FROM centos:8

COPY --from=build /artifacts.zip /

COPY copyables /

RUN yum -y update \
&& yum -y install unzip iptables sysvinit-tools \
&& yum -y install unzip iptables \
&& rm -rf /var/log/* /var/cache/yum/* /var/lib/yum/* \
&& chmod +x /entrypoint.sh /gencert.sh \
&& unzip -o /artifacts.zip -d / \
Expand All @@ -45,7 +45,7 @@ RUN yum -y update \

WORKDIR /usr/vpnserver/

VOLUME ["/usr/vpnserver/server_log/"]
VOLUME ["/usr/vpnserver/server_log/", "/usr/vpnserver/packet_log/", "/usr/vpnserver/security_log/"]

ENTRYPOINT ["/entrypoint.sh"]

Expand Down
12 changes: 6 additions & 6 deletions Dockerfile.alpine
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM alpine:3.9 as prep
FROM alpine:3.12 as prep

LABEL maintainer="Tomohisa Kusano <[email protected]>" \
contributors="See CONTRIBUTORS file <https://github.com/siomiz/SoftEtherVPN/blob/master/CONTRIBUTORS>"

ENV BUILD_VERSION=4.29-9680-rtm \
SHA256_SUM=c19cd49835c613cb5551ce66c91f90da3d3496ab3e15e8c61e22b464dc55d9b0
ENV BUILD_VERSION=4.34-9745-beta \
SHA256_SUM=a2d7951f4fafcef96ab8341a948a8d09ca02030e4161c5e90a34882aa8b34224

RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \
&& echo "${SHA256_SUM} v${BUILD_VERSION}.tar.gz" | sha256sum -c \
&& mkdir -p /usr/local/src \
&& tar -x -C /usr/local/src/ -f v${BUILD_VERSION}.tar.gz \
&& rm v${BUILD_VERSION}.tar.gz

FROM alpine:3.9 as build
FROM alpine:3.12 as build

COPY --from=prep /usr/local/src /usr/local/src

Expand All @@ -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.9
FROM alpine:3.12

COPY --from=build /artifacts.zip /

Expand All @@ -45,7 +45,7 @@ RUN apk add -U --no-cache bash iptables openssl-dev \

WORKDIR /usr/vpnserver/

VOLUME ["/usr/vpnserver/server_log/"]
VOLUME ["/usr/vpnserver/server_log/", "/usr/vpnserver/packet_log/", "/usr/vpnserver/security_log/"]

ENTRYPOINT ["/entrypoint.sh"]

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.debian
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM alpine:3.9 as prep
FROM alpine:3.12 as prep

LABEL maintainer="Tomohisa Kusano <[email protected]>" \
contributors="See CONTRIBUTORS file <https://github.com/siomiz/SoftEtherVPN/blob/master/CONTRIBUTORS>"

ENV BUILD_VERSION=4.29-9680-rtm \
SHA256_SUM=c19cd49835c613cb5551ce66c91f90da3d3496ab3e15e8c61e22b464dc55d9b0
ENV BUILD_VERSION=4.34-9745-beta \
SHA256_SUM=a2d7951f4fafcef96ab8341a948a8d09ca02030e4161c5e90a34882aa8b34224

RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \
&& echo "${SHA256_SUM} v${BUILD_VERSION}.tar.gz" | sha256sum -c \
Expand Down Expand Up @@ -61,7 +61,7 @@ RUN apt-get update \

WORKDIR /usr/vpnserver/

VOLUME ["/usr/vpnserver/server_log/"]
VOLUME ["/usr/vpnserver/server_log/", "/usr/vpnserver/packet_log/", "/usr/vpnserver/security_log/"]

ENTRYPOINT ["/entrypoint.sh"]

Expand Down
16 changes: 8 additions & 8 deletions Dockerfile.ubuntu
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM alpine:3.7 as prep
FROM alpine:3.12 as prep

LABEL maintainer="Tomohisa Kusano <[email protected]>" \
contributors="See CONTRIBUTORS file <https://github.com/siomiz/SoftEtherVPN/blob/master/CONTRIBUTORS>"

ENV BUILD_VERSION=4.29-9680-rtm \
SHA256_SUM=c19cd49835c613cb5551ce66c91f90da3d3496ab3e15e8c61e22b464dc55d9b0
ENV BUILD_VERSION=4.34-9745-beta \
SHA256_SUM=a2d7951f4fafcef96ab8341a948a8d09ca02030e4161c5e90a34882aa8b34224

RUN wget https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${BUILD_VERSION}.tar.gz \
&& echo "${SHA256_SUM} v${BUILD_VERSION}.tar.gz" | sha256sum -c \
&& mkdir -p /usr/local/src \
&& tar -x -C /usr/local/src/ -f v${BUILD_VERSION}.tar.gz \
&& rm v${BUILD_VERSION}.tar.gz

FROM ubuntu:18.04 as build
FROM ubuntu:20.04 as build

COPY --from=prep /usr/local/src /usr/local/src

Expand All @@ -21,7 +21,7 @@ RUN apt-get update \
build-essential \
libncurses5 \
libncurses5-dev \
libreadline7 \
libreadline8 \
libreadline-dev \
libssl1.1 \
libssl-dev \
Expand All @@ -36,7 +36,7 @@ RUN apt-get update \
&& touch /usr/vpnserver/vpn_server.config \
&& zip -r9 /artifacts.zip /usr/vpn* /usr/bin/vpn*

FROM ubuntu:18.04
FROM ubuntu:20.04

COPY --from=build /artifacts.zip /

Expand All @@ -45,7 +45,7 @@ COPY copyables /
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
libncurses5 \
libreadline7 \
libreadline8 \
libssl1.1 \
iptables \
unzip \
Expand All @@ -61,7 +61,7 @@ RUN apt-get update \

WORKDIR /usr/vpnserver/

VOLUME ["/usr/vpnserver/server_log/"]
VOLUME ["/usr/vpnserver/server_log/", "/usr/vpnserver/packet_log/", "/usr/vpnserver/security_log/"]

ENTRYPOINT ["/entrypoint.sh"]

Expand Down
12 changes: 6 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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`, `:9680`, `:4.29`, `:9680-centos`, `:4.29-centos` | `:9656`, `:4.25`, `:9656-centos`, `4.25-centos`
`debian:10-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` | -
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)
------------- | -- | -- | --
`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`

## Setup
- L2TP/IPSec PSK + OpenVPN
Expand Down
4 changes: 2 additions & 2 deletions push-tags.sh
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
set -x

SE_VERSION="4.29"
SE_REVISION="9680"
SE_VERSION="4.34"
SE_REVISION="9745"

BASE_TAGS="latest centos debian alpine ubuntu"

Expand Down

0 comments on commit ce5ea38

Please sign in to comment.