phusion baseimage way

jcap · Sep 3, 2015 · 3540974 · 3540974
1 parent 2fe119e
commit 3540974
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,8 @@ VOLUME ["/etc/openvpn"]
 EXPOSE 1194/udp
 
 WORKDIR /etc/openvpn
-CMD ["ovpn_run"]
 
 ADD ./bin /usr/local/bin
 RUN chmod a+x /usr/local/bin/*
+
+CMD ["/sbin/my_init"]
diff --git a/gantry b/gantry
@@ -14,7 +14,10 @@ init-vpn)
   docker run --volumes-from ${OVPN_DATA} --rm -it ${OVPN_IMAGE} /sbin/my_init -- ovpn_initpki
   ;;
 start-vpn)
-  docker run --name openvpn --volumes-from ${OVPN_DATA} -d -p 1194:1194/udp --cap-add=NET_ADMIN -e DEBUG=${OVPN_DEBUG} ${OVPN_IMAGE}
+  docker run --name openvpn --volumes-from ${OVPN_DATA} -d -p 1194:1194/udp --cap-add=NET_ADMIN -e DEBUG=${OVPN_DEBUG} ${OVPN_IMAGE} /sbin/my_init -- ovpn_run
+  ;;
+stop-vpn)
+  docker stop openvpn
   ;;
 gen-client)
   docker run --volumes-from $OVPN_DATA --rm -it jcap/openvpn /sbin/my_init -- easyrsa build-client-full $2 nopass