Merge 36bafb103d into dbc48ef3f1

Dockerfile.openvpn

@@ -1,7 +1,9 @@
 FROM alpine:3.16
-RUN apk add --update bash openvpn easy-rsa iptables  && \
+RUN apk add --update bash openvpn easy-rsa iptables git && \
     ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \
     wget https://github.com/pashcovich/openvpn-user/releases/download/v1.0.4/openvpn-user-linux-amd64.tar.gz -O - | tar xz -C /usr/local/bin && \
     rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
-COPY setup/ /etc/openvpn/setup
+RUN git clone https://github.com/flant/ovpn-admin.git /tmp/ovpn-admin
+RUN cp -r /tmp/ovpn-admin/setup /etc/openvpn/setup
+
 RUN chmod +x /etc/openvpn/setup/configure.sh

README.md

@@ -37,11 +37,18 @@ You need [Docker](https://docs.docker.com/get-docker/) and [docker-compose](http
 
 Commands to execute:
 
+* bash
 ```bash
 git clone https://github.com/flant/ovpn-admin.git
 cd ovpn-admin
 ./start.sh
 ```
+* powershell
+```bash
+git clone https://github.com/flant/ovpn-admin.git
+cd ovpn-admin
+./start.ps1
+```
 #### 1.1
 Ready docker images available on [Docker Hub](https://hub.docker.com/r/flant/ovpn-admin/tags) 
 . Tags are simple: `$VERSION` or `latest` for ovpn-admin and `openvpn-$VERSION` or `openvpn-latest` for openvpn-server

start.ps1

@@ -0,0 +1 @@
+docker-compose -p openvpn-master up -d --build