Merge pull request #2 from 2stacks/v1.3

Minor updates, bumped version number to v1.3

.dockerignore

@@ -1,5 +1,4 @@
 .dockerignore
 .git*
-docker-compose.yml
-Dockerfile
+.idea
 configs

.gitignore

@@ -0,0 +1,6 @@
+*~
+.idea/
+configs/ovpn/*.conf
+configs/ovpn/*.crt
+configs/ovpn/*.dh
+configs/ovpn/*.key

Dockerfile

@@ -4,31 +4,28 @@
 FROM ubuntu:16.04
 MAINTAINER "[email protected]"
 
-# Use docker build --pull --build-arg BUILD_DATE='date' -t 2stacks/docker-ovpn .
-ARG BUILD_DATE
-
 # Image details
-LABEL net.2stacks.build-date="$BUILD_DATE" \
-      net.2stacks.name="2stacks" \
+LABEL net.2stacks.name="2stacks" \
       net.2stacks.license="MIT" \
       net.2stacks.description="Dockerfile for autobuilds" \
       net.2stacks.url="http://www.2stacks.net" \
       net.2stacks.vcs-type="Git" \
-      net.2stacks.version="1.2"
+      net.2stacks.version="1.3" \
+      net.2stacks.ovpn.version="2.4.6"
 
 # Install OpenVPN
 RUN apt-get -y update && apt-get install -y \
                                               apt-transport-https \
                                               ca-certificates \
                                               curl \
-	                                      iptables \
+	                                          iptables \
                                               software-properties-common && \
     curl -fsSL https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add - && \
     add-apt-repository "deb [arch=amd64] http://build.openvpn.net/debian/openvpn/release/2.4 xenial main" && \
     apt-get -y update && apt-get install -y \
                                               easy-rsa \
                                               openvpn \
-	                                      openvpn-auth-radius \
+	                                          openvpn-auth-radius \
                                               freeradius-utils \
                                               iputils-ping \
     && rm -rf /var/lib/apt/lists/*

README.md

@@ -5,7 +5,8 @@ Server listens for connections on both UDP 1194 and TCP 443.  The server will lo
 for key material in '$PWD/config/ovpn'
 
 ## Supported tags
--   1.2, latest
+-   1.3, latest
+-   1.2
 -   1.1
 -   0.1b
 
@@ -49,7 +50,6 @@ docker run -itd \
   -h openvpn \
   --restart=always \
   --name openvpn \
-  --network=vpn \
   --cap-add=NET_ADMIN \
   -e "RADIUS_HOST=freeradius" \
   -e "RADIUS_KEY=testing123" \