Merging dev into master in prep for new release

.github/workflows/check-transmission-releases.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: dev
 
@@ -21,6 +21,8 @@ jobs:
           if [ "$LATEST_VERSION" != "$CURRENT_VERSION" ]; then
             echo "$LATEST_VERSION" > upstream/transmission-version.txt
             git add upstream/transmission-version.txt
+            git config user.email "[email protected]"
+            git config user.name "Transmission-Bot"
             git commit -m "update transmission build version to ${LATEST_VERSION}"
             git push origin dev
           fi

.github/workflows/docker-image-builds.yml

@@ -24,33 +24,29 @@ jobs:
             context: ./proxy
           - image-name: haugene/transmission-rss
             context: ./plugins/rss
-        platform:
-          - linux/amd64
-          - linux/arm
-          - linux/arm64
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # QEMU emulator to build for other platforms
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       # Buildx automates creating the multi-arch manifest build
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       # Authenticate so that we can push to Docker Hub
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       # Generate image tags and labels
       - name: Generate Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ matrix.image-name }}
@@ -63,10 +59,10 @@ jobs:
 
       # Finally, build and push the images
       - name: Build image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ${{ matrix.context }}
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64,linux/arm,linux/arm64
           build-args: |
             REVISION=${{ github.sha }}
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/docker-transmission-builds.yml

@@ -11,16 +11,9 @@ on:
 jobs:
   build-transmission:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm
-          - linux/arm64
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Get latest version of Transmission
       - name: Get Transmission version
@@ -30,33 +23,33 @@ jobs:
 
       # QEMU emulator to build for other platforms
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       # Buildx automates creating the multi-arch manifest build
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       # Authenticate so that we can push to Docker Hub
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       # Generate image tag and labels
       - name: Generate Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: haugene/transmission-builder
           tags: type=match,pattern=(\d+.\d+.\d+),group=1,value=${{ env.TBT_VERSION }}
 
       # Finally, build and push the image
       - name: Build image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: upstream
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64,linux/arm,linux/arm64
           build-args: |
             REVISION=${{ github.sha }}
             TBT_VERSION=${{ env.TBT_VERSION }}

.github/workflows/mkdocs.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v4

Dockerfile

@@ -39,7 +39,8 @@ RUN set -ex; \
       libminiupnpc-dev \
       libnatpmp-dev \
       libpsl-dev \
-      libssl-dev
+      libssl-dev \
+      natpmpc
 
 FROM haugene/transmission-builder:4.0.4 as TransmissionBuilder
 

README.md

@@ -1,5 +1,7 @@
 # OpenVPN and Transmission with WebUI
 
+[![Docker Build](https://img.shields.io/github/actions/workflow/status/haugene/docker-transmission-openvpn/docker-image-builds.yml
+)](https://hub.docker.com/r/haugene/transmission-openvpn/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/haugene/transmission-openvpn.svg)](https://hub.docker.com/r/haugene/transmission-openvpn/)
 
 This container contains OpenVPN and Transmission with a configuration

docs/tips-tricks.md

@@ -213,7 +213,7 @@ $ sudo systemctl start transmission-openvpn.service
 A working example of running this container behind a traefik reverse proxy can be found here:
 [Config](https://github.com/haugene/docker-transmission-openvpn/issues/1763#issuecomment-844404143)
 
-#### Running this container with Podman
+# Running this container with Podman
 
 The `podman run` command is almost identical to [the one mentioned in README.md](../README.md#docker-run) but with the following exception:
 

openvpn/fetch-external-configs.sh

@@ -64,7 +64,7 @@ elif [[ "${VPN_CONFIG_SOURCE_TYPE}" == "github_clone" ]]; then
       git -C "${config_repo}" checkout "${GITHUB_CONFIG_SOURCE_REVISION}"
     else
       echo "Cloning ${GITHUB_CONFIG_REPO_URL} into ${config_repo}"
-      config_repo_old="${config_repo}" + "_old"
+      config_repo_old="${config_repo}_old"
       mv "${config_repo}" "${config_repo_old}"
       git clone -b "${GITHUB_CONFIG_SOURCE_REVISION}" "${GITHUB_CONFIG_REPO_URL}" "${config_repo}"
     fi

openvpn/nordvpn/configure-openvpn.sh

@@ -7,7 +7,7 @@
 #
 # NORDVPN_COUNTRY: code or name
 # curl -s "https://api.nordvpn.com/v1/servers/countries" | jq --raw-output '.[] | [.code, .name] | @tsv'
-# NORDVPN_PROTOCOL: tcp or upd, tcp if none or unknown. Many technologies are not used as only openvpn_udp and openvpn_tcp are tested.
+# NORDVPN_PROTOCOL: tcp or udp, tcp if none or unknown. Many technologies are not used as only openvpn_udp and openvpn_tcp are tested.
 # Will request api with openvpn_<NORDVPN_PROTOCOL>.
 # curl -s "https://api.nordvpn.com/v1/technologies" | jq --raw-output '.[] | [.identifier, .name ] | @tsv' | grep openvpn
 # NORDVPN_CATEGORY: default p2p. not all countries have all combination of NORDVPN_PROTOCOL(technologies) and NORDVPN_CATEGORY(groups),
@@ -390,4 +390,4 @@ fi
 
 export OPENVPN_CONFIG=${selected}
 
-cd "${0%/*}"
+cd "${0%/*}"

privoxy/scripts/start.sh

@@ -30,8 +30,7 @@ set_port()
   # Set the port for the IPv4 interface
   adr=$(ip -4  a show eth0| grep -oP "(?<=inet )([^/]+)")
   adr=${adr:-"0.0.0.0"}
-  sed -i -E "s/^listen-address\s+.*/listen-address ${adr}:$1/" "$2"
-
+  sed -i -E "s/^listen-address.*/listen-address ${adr}:$1/" "$2"
 }
 
 if [[ "${WEBPROXY_ENABLED}" = "true" ]]; then

scripts/healthcheck.sh

@@ -59,7 +59,7 @@ if [[ ${WEBPROXY_ENABLED} =~ [yY][eE]?[Ss]?|[tT][Rr][Uu][eE] ]]; then
   if [[ ${PROXY} -eq 0 ]]; then
     echo "Privoxy warning: process was stopped, restarting."
   fi
-    proxy_ip=$(grep -oP "(?<=^listen-address )[0-9\.]+" /etc/privoxy/config)
+    proxy_ip=$(grep -i "^listen-address" /etc/privoxy/config | awk -F ' ' '{print $2}' | awk -F ':' '{print $1}')
     cont_ip=$(ip -j a show dev eth0 | jq -r .[].addr_info[].local)
     if [[ ${proxy_ip} != ${cont_ip} ]]; then
       echo "Privoxy error: container ip (${cont_ip} has changed: privoxy listening to ${proxy_ip}, restarting privoxy."

upstream/Dockerfile

@@ -33,7 +33,7 @@ RUN set -ex; \
       pkg-config \ 
       tzdata \
       xz-utils
-
+#This will build the transmission image to re-use in our container
 RUN mkdir -p /home/transmission4/ && cd /home/transmission4/ \
     && curl -L -o transmission4.tar.xz "https://github.com/transmission/transmission/releases/download/${TBT_VERSION}/transmission-${TBT_VERSION}.tar.xz" \
     && tar -xf transmission4.tar.xz && cd "transmission-${TBT_VERSION}" && mkdir build && cd build \

upstream/transmission-version.txt

@@ -1 +1 @@
-4.0.4
+4.0.5