2 Commits a33b36c68f ... d6541b1dd6

Author SHA1 Message Date
  Fabian Peter Hammerle d6541b1dd6 make openvpn config path configurable 3 years ago
  Fabian Peter Hammerle d5b0d4feb7 upgrade base image alpine v3.9 -> v3.12; pin openvpn package version 3 years ago
3 changed files with 8 additions and 4 deletions
  1. 4 2
      Dockerfile
  2. 2 0
      docker-compose.yml
  3. 2 2
      vpn.sh

+ 4 - 2
Dockerfile

@@ -1,7 +1,9 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
-RUN apk add --no-cache openvpn
+ARG OPENVPN_PACKAGE_VERSION=2.4.9-r0
+RUN apk add --no-cache openvpn=$OPENVPN_PACKAGE_VERSION
 
 VOLUME /vpn-config
+ENV OPENVPN_CONFIG_PATH=/vpn-config/hackthebox.ovpn
 COPY ./vpn.sh /vpn.sh
 CMD ["/vpn.sh"]

+ 2 - 0
docker-compose.yml

@@ -8,6 +8,8 @@ services:
     build: .
     image: fphammerle/hackthebox-gateway
     container_name: hackthebox_gateway
+    #environment:
+    #  OPENVPN_CONFIG_PATH: /vpn-config/config.ovpn
     volumes:
     - vpn_config:/vpn-config:ro
     devices:

+ 2 - 2
vpn.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-set -ex
+set -eux
 
 iptables -P FORWARD DROP
 iptables -A FORWARD -i eth0 -o tun0 -d 10.10.10.0/24 -j ACCEPT
 iptables -A FORWARD -i tun0 -o eth0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
 iptables -t nat -A POSTROUTING -o tun0 -j MASQUERADE
 
-openvpn --config /vpn-config/hackthebox.ovpn \
+openvpn --config "$OPENVPN_CONFIG_PATH" \
     --user openvpn --group openvpn