Merge branch 'patch-1' into 'master'

Optimize the Dockerfile. Handle ovpn not initialized

See merge request ix.ai/openvpn!22

Author: tlex

Dockerfile

@@ -4,20 +4,30 @@ FROM alpine:latest
 LABEL maintainer="[email protected]" \
       ai.ix.repository="ix.ai/openvpn"
 
+ADD bin/* /usr/local/bin/
+
+# Add support for OTP authentication using a PAM module
+ADD ./otp/openvpn /etc/pam.d/
+
 # Testing: pamtester
-RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \
-    apk --no-cache upgrade && \
-    apk add --no-cache --update openvpn \
-                                dnsmasq \
-                                iptables \
-                                bash \
-                                easy-rsa \
-                                openvpn-auth-pam \
-                                google-authenticator \
-                                pamtester \
-                                libqrencode && \
-    ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \
-    rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
+RUN set -eux; \
+  \
+  echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories; \
+  apk --no-cache upgrade; \
+  apk add --no-cache --update \
+    openvpn \
+    dnsmasq \
+    iptables \
+    bash \
+    easy-rsa \
+    openvpn-auth-pam \
+    google-authenticator \
+    pamtester \
+    libqrencode \
+  ; \
+  ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin; \
+  rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*; \
+  chmod a+x /usr/local/bin/*
 
 # Needed by scripts
 ENV OPENVPN /etc/openvpn
@@ -34,9 +44,3 @@ VOLUME ["/etc/openvpn"]
 EXPOSE 1194/udp
 
 CMD ["ovpn_run"]
-
-ADD ./bin /usr/local/bin
-RUN chmod a+x /usr/local/bin/*
-
-# Add support for OTP authentication using a PAM module
-ADD ./otp/openvpn /etc/pam.d/

bin/ovpn_run

@@ -81,7 +81,14 @@ function startDnsmasq() {
 
 addArg "--config" "$OPENVPN/openvpn.conf"
 
-source "$OPENVPN/ovpn_env.sh"
+if [ ! -f "${OPENVPN}/ovpn_env.sh" ]; then
+  echo "Can't find ${OPENVPN}/ovpn_env.sh."
+  echo "Please make sure that OpenVPN is initialized and the proper volume is mounted!"
+  echo "For details see https://ix.ai/openvpn/-/blob/master/README.md#quick-start"
+  exit 1
+fi
+
+source "${OPENVPN}/ovpn_env.sh"
 
 mkdir -p /dev/net
 if [ ! -c /dev/net/tun ]; then