Dockerfile: Add ENV configuration

* Add ENV configuration options to Dockerfile as opposed to keeping in
  the wrapper script.
* First step to splitting up openvpn.sh in to smaller scripts.
This commit is contained in:
Kyle Manna 2014-06-04 10:52:59 -07:00
parent f6474d06f9
commit 035ff64200
2 changed files with 6 additions and 7 deletions

View File

@ -14,6 +14,12 @@ RUN ln -s /usr/local/share/easy-rsa/easyrsa3/easyrsa /usr/local/bin
ADD ./bin /usr/local/bin ADD ./bin /usr/local/bin
RUN chmod a+x /usr/local/bin/* RUN chmod a+x /usr/local/bin/*
# Needed by scripts
ENV OPENVPN /etc/openvpn
ENV EASYRSA /usr/local/share/easy-rsa/easyrsa3
ENV EASYRSA_PKI $OPENVPN/pki
ENV EASYRSA_VARS_FILE $OPENVPN/vars
VOLUME ["/etc/openvpn"] VOLUME ["/etc/openvpn"]
EXPOSE 1194/udp EXPOSE 1194/udp

View File

@ -3,13 +3,6 @@
# OpenVPN + Docker Wrapper Script # OpenVPN + Docker Wrapper Script
# #
OPENVPN="/etc/openvpn"
# Needed by easyrsa itself
export EASYRSA="/usr/local/share/easy-rsa/easyrsa3"
export EASYRSA_PKI="$OPENVPN/pki"
export EASYRSA_VARS_FILE="$OPENVPN/vars"
set -ex set -ex
abort() { abort() {