Skip to content

Commit

Permalink
Merging dev into master in prep for new release (#2755)
Browse files Browse the repository at this point in the history
* Add Transmissionic Web UI & New Documentation (#2589)

* Added step to build a .deb file to install and reduce image size (#2590)

* Added step to build a .deb file to install and reduce image size

* Fixed deb install incorrectly done

* Check for update-port script existing instead of being executable (#2593)

#2459

* Fixed TWC paths (#2600)

* add docker build caching to workflow (#2609)

* Privoxy eth0 fixes, healthcheck comparison tweak and start.sh update (#2610)

* by checking for existence of default 127 address,healthcheck will never effectively run, as the non-default eth0 ip will never be matched

* the comparison was not trimming off the port, thus healthcheck was always going to fail or denote a change when there may have been none

* simplified the comparison (thanks @edgd1er )

* Strip double quotes from umask check (#2601)

* Fix problem with enabled UFW with Random Ports (#2603)

Fixing #2255

* move vpn config download to /config (#2592)

* move vpn config download to /config

* fix git safe dir permissions

* cleanup vpn config clone

* re-add zip dl, set git to default

* use alpine:latest for TransmissionUIs build stage (#2573)

* Update fetch-external-configs.sh

removed duplicate bracket

* Update to transmission 4.0.4

* Update configure-openvpn.sh

* Switched the order of events, to remove the ipv6 before sed-ing the address (#2695)

* Create separate image for transmission build from source (#2691)

* separate transmission build to separate image and workflow

* set transmission-builder version

* use matrix for multi runner builds

* fix context

* parallel docker builds with matrix (#2694)

* consolidate and parallelize image build with matrix multi runner build

* fix image name

* Update Dockerfile

fixed typo

* `TRANSMISSION_RPC_URL` option causes a moved permanently error when using PIA (#2657)

* Respect option `TRANSMISSION_RPC_URL`

remove debug echo

* default `TRANSMISSION_RPC_URL` is now grabbed from `default-settings.json`

* Stricter grep pattern

* Remove redundant grep

* Added comment

* Use `jq` instead of `sed` to determine the default of `TRANSMISSION_RPC_URL`

---------

Co-authored-by: Mark Honkoop <[email protected]>

* Fix for PR #2691 (#2698)

* separate transmission build to separate image and workflow

* set transmission-builder version

* use matrix for multi runner builds

* fix context

* Fix file name

* fix image name

* Fix #2694 image build (#2699)

* consolidate and parallelize image build with matrix multi runner build

* fix image name

* update master (#2696)

* Add Transmissionic Web UI & New Documentation (#2589)

* Added step to build a .deb file to install and reduce image size (#2590)

* Added step to build a .deb file to install and reduce image size

* Fixed deb install incorrectly done

* Check for update-port script existing instead of being executable (#2593)

#2459

* Fixed TWC paths (#2600)

* add docker build caching to workflow (#2609)

* Privoxy eth0 fixes, healthcheck comparison tweak and start.sh update (#2610)

* by checking for existence of default 127 address,healthcheck will never effectively run, as the non-default eth0 ip will never be matched

* the comparison was not trimming off the port, thus healthcheck was always going to fail or denote a change when there may have been none

* simplified the comparison (thanks @edgd1er )

* Strip double quotes from umask check (#2601)

* Fix problem with enabled UFW with Random Ports (#2603)

Fixing #2255

* move vpn config download to /config (#2592)

* move vpn config download to /config

* fix git safe dir permissions

* cleanup vpn config clone

* re-add zip dl, set git to default

* use alpine:latest for TransmissionUIs build stage (#2573)

* Update fetch-external-configs.sh

removed duplicate bracket

* Update to transmission 4.0.4

* Update configure-openvpn.sh

* Switched the order of events, to remove the ipv6 before sed-ing the address (#2695)

* Create separate image for transmission build from source (#2691)

* separate transmission build to separate image and workflow

* set transmission-builder version

* use matrix for multi runner builds

* fix context

* parallel docker builds with matrix (#2694)

* consolidate and parallelize image build with matrix multi runner build

* fix image name

* Update Dockerfile

fixed typo

* `TRANSMISSION_RPC_URL` option causes a moved permanently error when using PIA (#2657)

* Respect option `TRANSMISSION_RPC_URL`

remove debug echo

* default `TRANSMISSION_RPC_URL` is now grabbed from `default-settings.json`

* Stricter grep pattern

* Remove redundant grep

* Added comment

* Use `jq` instead of `sed` to determine the default of `TRANSMISSION_RPC_URL`

---------

Co-authored-by: Mark Honkoop <[email protected]>

* Fix for PR #2691 (#2698)

* separate transmission build to separate image and workflow

* set transmission-builder version

* use matrix for multi runner builds

* fix context

* Fix file name

* fix image name

---------

Co-authored-by: Anastasiya Polina Soyka <[email protected]>
Co-authored-by: Geoff <[email protected]>
Co-authored-by: ksurl <[email protected]>
Co-authored-by: HeavyGee <[email protected]>
Co-authored-by: WitchRecipe <[email protected]>
Co-authored-by: Florian Kretschmer <[email protected]>
Co-authored-by: Aemulation <[email protected]>
Co-authored-by: Mark Honkoop <[email protected]>

* fix matrix to build all images

---------

Co-authored-by: Patrick Kishino <[email protected]>
Co-authored-by: Anastasiya Polina Soyka <[email protected]>
Co-authored-by: Geoff <[email protected]>
Co-authored-by: HeavyGee <[email protected]>
Co-authored-by: WitchRecipe <[email protected]>
Co-authored-by: Florian Kretschmer <[email protected]>
Co-authored-by: Aemulation <[email protected]>
Co-authored-by: Mark Honkoop <[email protected]>

* fix transmission version check (#2700)

* Comment

* Switch transmission builder image to combined platform builder (#2704)

* separate transmission build to separate image and workflow

* set transmission-builder version

* use matrix for multi runner builds

* fix context

* Fix file name

* fix image name

* fix transmission build version detection

* switch to combined platform builder

---------

Co-authored-by: Patrick Kishino <[email protected]>

* switch to single platform builder (#2705)

Co-authored-by: Patrick Kishino <[email protected]>

* Fix web proxy stopping to work (#2678)

* Mix of fixes to the heathcheck.sh from #2610 and start.sh from #2673.

* Made few more modifications to healthcheck.sh and start.sh. This change appears to be working.
Let's monitor this.

---------

Co-authored-by: Patrick Kishino <[email protected]>

* Remove script_security (#2702)

Due to non-support of this in latest openvpn it is removed..

* Revert "Remove script_security (#2702)" (#2708)

This reverts commit 44ba9e6.

* Update configure-openvpn.sh (#2707)

Using "upd" as a value for NORDVPN_PROTOCOL results in an error.

Co-authored-by: Patrick Kishino <[email protected]>

* Add natpmpc (#2746)

* Dev (#2706)

* Add Transmissionic Web UI & New Documentation (#2589)

* Added step to build a .deb file to install and reduce image size (#2590)

* Added step to build a .deb file to install and reduce image size

* Fixed deb install incorrectly done

* Check for update-port script existing instead of being executable (#2593)

#2459

* Fixed TWC paths (#2600)

* add docker build caching to workflow (#2609)

* Privoxy eth0 fixes, healthcheck comparison tweak and start.sh update (#2610)

* by checking for existence of default 127 address,healthcheck will never effectively run, as the non-default eth0 ip will never be matched

* the comparison was not trimming off the port, thus healthcheck was always going to fail or denote a change when there may have been none

* simplified the comparison (thanks @edgd1er )

* Strip double quotes from umask check (#2601)

* Fix problem with enabled UFW with Random Ports (#2603)

Fixing #2255

* move vpn config download to /config (#2592)

* move vpn config download to /config

* fix git safe dir permissions

* cleanup vpn config clone

* re-add zip dl, set git to default

* use alpine:latest for TransmissionUIs build stage (#2573)

* Update fetch-external-configs.sh

removed duplicate bracket

* Update to transmission 4.0.4

* Update configure-openvpn.sh

* Switched the order of events, to remove the ipv6 before sed-ing the address (#2695)

* Create separate image for transmission build from source (#2691)

* separate transmission build to separate image and workflow

* set transmission-builder version

* use matrix for multi runner builds

* fix context

* parallel docker builds with matrix (#2694)

* consolidate and parallelize image build with matrix multi runner build

* fix image name

* Update Dockerfile

fixed typo

* `TRANSMISSION_RPC_URL` option causes a moved permanently error when using PIA (#2657)

* Respect option `TRANSMISSION_RPC_URL`

remove debug echo

* default `TRANSMISSION_RPC_URL` is now grabbed from `default-settings.json`

* Stricter grep pattern

* Remove redundant grep

* Added comment

* Use `jq` instead of `sed` to determine the default of `TRANSMISSION_RPC_URL`

---------

Co-authored-by: Mark Honkoop <[email protected]>

* Fix for PR #2691 (#2698)

* separate transmission build to separate image and workflow

* set transmission-builder version

* use matrix for multi runner builds

* fix context

* Fix file name

* fix image name

* Fix #2694 image build (#2699)

* consolidate and parallelize image build with matrix multi runner build

* fix image name

* update master (#2696)

* Add Transmissionic Web UI & New Documentation (#2589)

* Added step to build a .deb file to install and reduce image size (#2590)

* Added step to build a .deb file to install and reduce image size

* Fixed deb install incorrectly done

* Check for update-port script existing instead of being executable (#2593)

#2459

* Fixed TWC paths (#2600)

* add docker build caching to workflow (#2609)

* Privoxy eth0 fixes, healthcheck comparison tweak and start.sh update (#2610)

* by checking for existence of default 127 address,healthcheck will never effectively run, as the non-default eth0 ip will never be matched

* the comparison was not trimming off the port, thus healthcheck was always going to fail or denote a change when there may have been none

* simplified the comparison (thanks @edgd1er )

* Strip double quotes from umask check (#2601)

* Fix problem with enabled UFW with Random Ports (#2603)

Fixing #2255

* move vpn config download to /config (#2592)

* move vpn config download to /config

* fix git safe dir permissions

* cleanup vpn config clone

* re-add zip dl, set git to default

* use alpine:latest for TransmissionUIs build stage (#2573)

* Update fetch-external-configs.sh

removed duplicate bracket

* Update to transmission 4.0.4

* Update configure-openvpn.sh

* Switched the order of events, to remove the ipv6 before sed-ing the address (#2695)

* Create separate image for transmission build from source (#2691)

* separate transmission build to separate image and workflow

* set transmission-builder version

* use matrix for multi runner builds

* fix context

* parallel docker builds with matrix (#2694)

* consolidate and parallelize image build with matrix multi runner build

* fix image name

* Update Dockerfile

fixed typo

* `TRANSMISSION_RPC_URL` option causes a moved permanently error when using PIA (#2657)

* Respect option `TRANSMISSION_RPC_URL`

remove debug echo

* default `TRANSMISSION_RPC_URL` is now grabbed from `default-settings.json`

* Stricter grep pattern

* Remove redundant grep

* Added comment

* Use `jq` instead of `sed` to determine the default of `TRANSMISSION_RPC_URL`

---------

Co-authored-by: Mark Honkoop <[email protected]>

* Fix for PR #2691 (#2698)

* separate transmission build to separate image and workflow

* set transmission-builder version

* use matrix for multi runner builds

* fix context

* Fix file name

* fix image name

---------

Co-authored-by: Anastasiya Polina Soyka <[email protected]>
Co-authored-by: Geoff <[email protected]>
Co-authored-by: ksurl <[email protected]>
Co-authored-by: HeavyGee <[email protected]>
Co-authored-by: WitchRecipe <[email protected]>
Co-authored-by: Florian Kretschmer <[email protected]>
Co-authored-by: Aemulation <[email protected]>
Co-authored-by: Mark Honkoop <[email protected]>

* fix matrix to build all images

---------

Co-authored-by: Patrick Kishino <[email protected]>
Co-authored-by: Anastasiya Polina Soyka <[email protected]>
Co-authored-by: Geoff <[email protected]>
Co-authored-by: HeavyGee <[email protected]>
Co-authored-by: WitchRecipe <[email protected]>
Co-authored-by: Florian Kretschmer <[email protected]>
Co-authored-by: Aemulation <[email protected]>
Co-authored-by: Mark Honkoop <[email protected]>

* fix transmission version check (#2700)

* Comment

* Switch transmission builder image to combined platform builder (#2704)

* separate transmission build to separate image and workflow

* set transmission-builder version

* use matrix for multi runner builds

* fix context

* Fix file name

* fix image name

* fix transmission build version detection

* switch to combined platform builder

---------

Co-authored-by: Patrick Kishino <[email protected]>

* switch to single platform builder (#2705)

Co-authored-by: Patrick Kishino <[email protected]>

---------

Co-authored-by: Anastasiya Polina Soyka <[email protected]>
Co-authored-by: Geoff <[email protected]>
Co-authored-by: ksurl <[email protected]>
Co-authored-by: HeavyGee <[email protected]>
Co-authored-by: WitchRecipe <[email protected]>
Co-authored-by: Florian Kretschmer <[email protected]>
Co-authored-by: Aemulation <[email protected]>
Co-authored-by: Mark Honkoop <[email protected]>

* Update README.md

* Bump actions/checkout from 3 to 4 (#2714)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump docker/setup-buildx-action from 2 to 3 (#2718)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@v2...v3)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump docker/login-action from 2 to 3 (#2719)

Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump docker/setup-qemu-action from 2 to 3 (#2720)

Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](docker/setup-qemu-action@v2...v3)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump docker/metadata-action from 4 to 5 (#2721)

Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4 to 5.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](docker/metadata-action@v4...v5)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump docker/build-push-action from 4 to 5 (#2722)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v4...v5)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update tips-tricks.md

fixed pod man tip

* fixing invalid concatenation (#2743)

* fixing invalid concatenation

---------

Co-authored-by: Patrick Kishino <[email protected]>

* install natpmpc

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Patrick Kishino <[email protected]>
Co-authored-by: Anastasiya Polina Soyka <[email protected]>
Co-authored-by: Geoff <[email protected]>
Co-authored-by: ksurl <[email protected]>
Co-authored-by: HeavyGee <[email protected]>
Co-authored-by: WitchRecipe <[email protected]>
Co-authored-by: Florian Kretschmer <[email protected]>
Co-authored-by: Aemulation <[email protected]>
Co-authored-by: Mark Honkoop <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Storm <[email protected]>

* update transmission build version to 4.0.5

* fix: transmission version check (#2753)

* fix transmission version check

* add git user config

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Anastasiya Polina Soyka <[email protected]>
Co-authored-by: Geoff <[email protected]>
Co-authored-by: ksurl <[email protected]>
Co-authored-by: HeavyGee <[email protected]>
Co-authored-by: WitchRecipe <[email protected]>
Co-authored-by: Florian Kretschmer <[email protected]>
Co-authored-by: Aemulation <[email protected]>
Co-authored-by: Mark Honkoop <[email protected]>
Co-authored-by: JeeDeWee <[email protected]>
Co-authored-by: Ian Moroney <[email protected]>
Co-authored-by: Mugga Joe <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Storm <[email protected]>
Co-authored-by: workflow runner <[email protected]>
  • Loading branch information
15 people authored Dec 8, 2023
1 parent 69ca229 commit 90bb802
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/check-transmission-releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
git config --global user.email "[email protected]"
git config --global user.name "workflow runner"
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
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions openvpn/nordvpn/configure-openvpn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -390,4 +390,4 @@ fi

export OPENVPN_CONFIG=${selected}

cd "${0%/*}"
cd "${0%/*}"
3 changes: 1 addition & 2 deletions privoxy/scripts/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/healthcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion upstream/transmission-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.4
4.0.5

0 comments on commit 90bb802

Please sign in to comment.