add basic docker-compose.yml

siomiz · Sep 5, 2018 · 2d199b1 · 2d199b1
1 parent 99c4b0d
commit 2d199b1
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -23,6 +23,7 @@ RUN yum -y update \
     && ./configure \
     && make \
     && make install \
+    && touch /usr/vpnserver/vpn_server.config \
     && zip -r9 /artifacts.zip /usr/vpn* /usr/bin/vpn*
 
 FROM centos:7

diff --git a/Dockerfile.alpine b/Dockerfile.alpine
@@ -23,6 +23,7 @@ RUN apk add -U build-base ncurses-dev openssl-dev readline-dev zip \
     && ./configure \
     && make \
     && make install \
+    && touch /usr/vpnserver/vpn_server.config \
     && zip -r9 /artifacts.zip /usr/vpn* /usr/bin/vpn*
 
 FROM alpine:3.7

diff --git a/Dockerfile.debian b/Dockerfile.debian
@@ -33,6 +33,7 @@ RUN apt-get update \
     && ./configure \
     && make \
     && make install \
+    && touch /usr/vpnserver/vpn_server.config \
     && zip -r9 /artifacts.zip /usr/vpn* /usr/bin/vpn*
 
 FROM debian:9-slim

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
@@ -33,6 +33,7 @@ RUN apt-get update \
     && ./configure \
     && make \
     && make install \
+    && touch /usr/vpnserver/vpn_server.config \
     && zip -r9 /artifacts.zip /usr/vpn* /usr/bin/vpn*
 
 FROM ubuntu:18.04

diff --git a/copyables/entrypoint.sh b/copyables/entrypoint.sh
@@ -19,7 +19,9 @@ then
 fi
 set -e
 
-if [ ! -f /usr/vpnserver/vpn_server.config ]; then
+CONFIG=/usr/vpnserver/vpn_server.config
+
+if [ ! -f $CONFIG ] || [ ! -s $CONFIG ]; then
 
 : ${PSK:='notasecret'}
 
@@ -178,6 +180,10 @@ set -e
 
 echo \# [initial setup OK]
 
+else
+
+echo \# [running with existing config]
+
 fi
 
 if [[ -d "/opt/scripts/" ]]; then

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,15 @@
+version: "3"
+
+services:
+  app:
+    image: siomiz/softethervpn
+    volumes:
+      - ./vpn_server.config:/usr/vpnserver/vpn_server.config
+    cap_add:
+      - NET_ADMIN
+    ports:
+      - 500:500/udp
+      - 4500:4500/udp
+      - 1701:1701/tcp
+      - 1194:1194/udp
+      - 5555:5555/tcp
diff --git a/vpn_server.config b/vpn_server.config