Make insignificant changes

build.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import datetime
-import subprocess
-
-
-parser = argparse.ArgumentParser()
-parser.add_argument('image_version')
-args = parser.parse_args()
-
-docker_build_cmd = [
-    'docker', 'build',
-    '--build-arg', f'BUILD_DATE={str(datetime.datetime.utcnow())}',
-    '--build-arg', f'IMAGE_VERSION={args.image_version}',
-    '--tag', f'ghcr.io/wfg/openvpn-client:{args.image_version}',
-    '--tag', 'ghcr.io/wfg/openvpn-client:latest',
-    './build',
-]
-subprocess.run(docker_build_cmd)

build/entry.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-set -e
+set -o errexit
+set -o nounset
+set -o pipefail
 
 cleanup() {
     kill TERM "$openvpn_pid"
@@ -19,7 +21,7 @@ else
 fi
 
 if [[ -z $config_file ]]; then
-    >&2 echo 'no openvpn configuration file found'
+    echo "no openvpn configuration file found" >&2
     exit 1
 fi
 

build/killswitch.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-set -e
+set -o errexit
+set -o nounset
+set -o pipefail
 
 iptables --insert OUTPUT \
     ! --out-interface tun0 \
@@ -19,14 +21,14 @@ done
 # Punch holes in the firewall for the OpenVPN server addresses
 # $config is set by OpenVPN:
 #   "Name of first --config file. Set on program initiation and reset on SIGHUP."
-global_port=$(awk '$1 == "port" { print $2 }' "${config:?}")
-global_protocol=$(awk '$1 == "proto" { print $2 }' "${config:?}")
-remotes=$(awk '$1 == "remote" { print $2, $3, $4 }' "${config:?}")
+global_port=$(awk '$1 == "port" { print $2 }' "${config:?"config file not found by kill switch"}")
+global_protocol=$(awk '$1 == "proto" { print $2 }' "${config:?"config file not found by kill switch"}")
+remotes=$(awk '$1 == "remote" { print $2, $3, $4 }' "${config:?"config file not found by kill switch"}")
 ip_regex='^(([1-9]?[0-9]|1[0-9][0-9]|2([0-4][0-9]|5[0-5]))\.){3}([1-9]?[0-9]|1[0-9][0-9]|2([0-4][0-9]|5[0-5]))$'
 while IFS= read -r line; do
     # Read a comment-stripped version of the line
     # Fixes #84
-    IFS=' ' read -ra remote <<< "${line%%\#*}"
+    IFS=" " read -ra remote <<< "${line%%\#*}"
     address=${remote[0]}
     port=${remote[1]:-${global_port:-1194}}
     protocol=${remote[2]:-${global_protocol:-udp}}

docker-compose.yml

@@ -3,11 +3,11 @@ services:
     image: ghcr.io/wfg/openvpn-client:latest
     container_name: openvpn-client
     cap_add:
-    - NET_ADMIN
+      - NET_ADMIN
     devices:
-    - /dev/net/tun:/dev/net/tun
+      - /dev/net/tun:/dev/net/tun
     environment:
-    - ALLOWED_SUBNETS=192.168.10.0/24
+      - ALLOWED_SUBNETS=192.168.10.0/24
     volumes:
-    - ./local:/config
+      - ./local:/config
     restart: unless-stopped