From 598670b9144b2e9a4aad27bca4bf114196548cda Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 26 Oct 2023 12:47:06 -0600 Subject: [PATCH 1/5] fix: update expressvpn on install to get latest version Signed-off-by: Andrew --- expressvpn/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/expressvpn/Dockerfile b/expressvpn/Dockerfile index b68aa14..8b34149 100644 --- a/expressvpn/Dockerfile +++ b/expressvpn/Dockerfile @@ -14,11 +14,12 @@ ARG APP=expressvpn_3.55.0.4-1_amd64.deb RUN apt-get update && apt-get install -y --no-install-recommends \ libterm-readkey-perl ca-certificates wget expect iproute2 iputils-ping curl procps libnm0 \ - && rm -rf /var/lib/apt/lists/* \ && wget -q "https://www.expressvpn.works/clients/linux/${APP}" -O /tmp/${APP} \ && dpkg -i /tmp/${APP} \ && rm -rf /tmp/*.deb \ && apt-get purge -y --auto-remove wget + && apt-get update && apt-get upgrade expressvpn \ + && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /tmp/entrypoint.sh COPY expressvpnActivate.sh /tmp/expressvpnActivate.sh From b974ca8a0b2ce33a8274c65fcbaac807952f9b83 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 26 Oct 2023 12:47:35 -0600 Subject: [PATCH 2/5] chore: update expressvpn-transmission README to include wildcard allow IP addresses Signed-off-by: Andrew --- expressvpn-transmission/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/expressvpn-transmission/README.md b/expressvpn-transmission/README.md index e87b1b1..6121049 100644 --- a/expressvpn-transmission/README.md +++ b/expressvpn-transmission/README.md @@ -44,9 +44,9 @@ A optional string containing the ExpressVPN server LOCATION/ALIAS/COUNTRY. Conne `SERVER=ukbe` ### T_ALLOWED -A optional string containing the Transmission IP addresses' whitelist. 127.0.0.1 is not set. +A optional string containing the Transmission IP addresses' whitelist. 127.0.0.1 is not set. Use `*` for wildcards. -`T_ALLOWED=127.0.0.1,172.17.0.1` +`T_ALLOWED=127.0.0.1,172.17.0.1,192.168.0.*` ### T_USERNAME & T_PASSWORD Optional strings containing the Transmission username and password if you want to authenticate. There is no authentication if not set. From ba2d097e9e12dda3f6e0c1c1abebb38423cf833e Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 26 Oct 2023 12:50:46 -0600 Subject: [PATCH 3/5] fix: Dockerfile typos Signed-off-by: Andrew --- expressvpn/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/expressvpn/Dockerfile b/expressvpn/Dockerfile index 8b34149..4b61af1 100644 --- a/expressvpn/Dockerfile +++ b/expressvpn/Dockerfile @@ -17,8 +17,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && wget -q "https://www.expressvpn.works/clients/linux/${APP}" -O /tmp/${APP} \ && dpkg -i /tmp/${APP} \ && rm -rf /tmp/*.deb \ - && apt-get purge -y --auto-remove wget - && apt-get update && apt-get upgrade expressvpn \ + && apt-get update && apt-get upgrade -y expressvpn \ + && apt-get purge -y --auto-remove wget \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /tmp/entrypoint.sh From d7c8197ce97f68110fcb483255c7c3aa9c58d8f5 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 26 Oct 2023 12:56:51 -0600 Subject: [PATCH 4/5] feat: add dockerfile example Signed-off-by: Andrew --- .../docker-compose-example.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 expressvpn-transmission/docker-compose-example.yaml diff --git a/expressvpn-transmission/docker-compose-example.yaml b/expressvpn-transmission/docker-compose-example.yaml new file mode 100644 index 0000000..44b3873 --- /dev/null +++ b/expressvpn-transmission/docker-compose-example.yaml @@ -0,0 +1,20 @@ +--- +version: "3" +services: + transmission: + image: polkaned/expressvpn-transmission + container_name: express-transmission + privileged: true + tty: true + environment: + ACTIVATION_CODE: EXPRESSVPN-ACTIVATION-CODE + T_ALLOWED: "127.0.0.1,192.168.0.*" + T_USERNAME: "username" + T_PASSWORD: "password" + devices: + - "/dev/net/tun" + cap_add: + - NET_ADMIN + ports: + - 9091:9091 + From a74ec74c1f764a63c7c97b4ea08edbf5614c3041 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 26 Oct 2023 13:01:23 -0600 Subject: [PATCH 5/5] fix: added volumes to docker-compose example Signed-off-by: Andrew --- expressvpn-transmission/docker-compose-example.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/expressvpn-transmission/docker-compose-example.yaml b/expressvpn-transmission/docker-compose-example.yaml index 44b3873..db4dfbc 100644 --- a/expressvpn-transmission/docker-compose-example.yaml +++ b/expressvpn-transmission/docker-compose-example.yaml @@ -6,6 +6,8 @@ services: container_name: express-transmission privileged: true tty: true + volumes: + - /home/user/Torrents:/var/lib/transmission-daemon/downloads environment: ACTIVATION_CODE: EXPRESSVPN-ACTIVATION-CODE T_ALLOWED: "127.0.0.1,192.168.0.*"