Skip to content

Commit 314e482

Browse files
committed
Merge branch 'trjohnson19/2025-05-08T12_48-update-uris-for-unifi-topology' of github.com:trjohnson19/docker-stack into trjohnson19/2025-05-08T12_48-update-uris-for-unifi-topology
2 parents c017602 + d67f4dc commit 314e482

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

.github/workflows/differential-shellcheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
steps:
2121
- name: Repository checkout
2222
# yamllint disable-line rule:line-length
23-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # @v4.2.1
23+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # @v4.2.2
2424
with:
2525
fetch-depth: 0
2626

2727
- name: Differential ShellCheck
2828
# yamllint disable-line rule:line-length
29-
uses: redhat-plumbers-in-action/differential-shellcheck@cc6721c45a8800cc666de45493545a07a638d121 #@v5.4.0
29+
uses: redhat-plumbers-in-action/differential-shellcheck@dd551ce780d8af741f8cd8bab6982667b906b457 #@v5.5.3
3030
with:
3131
severity: warning
3232
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/super-linter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323
steps:
2424
- name: Checkout code
2525
# yamllint disable-line rule:line-length
26-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # @v4.2.1
26+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # @v4.2.2
2727
with:
2828
## Full git history is needed to get a proper list of changed files
2929
## within `super-linter`
3030
fetch-depth: 0
3131

3232
- name: Lint Code Base
3333
# yamllint disable-line rule:line-length
34-
uses: super-linter/super-linter@b92721f792f381cedc002ecdbb9847a15ece5bb8 # @v7.1.0
34+
uses: super-linter/super-linter@4e8a7c2bf106c4c766c816b35ec612638dc9b6b2 # @v7.3.0
3535
env:
3636
VALIDATE_ALL_CODEBASE: false
3737
DEFAULT_BRANCH: "main"

docker-compose-t2.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,7 +2021,7 @@ services:
20212021

20222022
## Gluetun - VPN client in a thin Docker container
20232023
gluetun:
2024-
image: ghcr.io/qdm12/gluetun:latest
2024+
image: ghcr.io/qdm12/gluetun:v3
20252025
container_name: gluetun
20262026
networks:
20272027
gluetun_net:
@@ -2060,6 +2060,7 @@ services:
20602060
UPDATER_PERIOD: "24h"
20612061
HTTP_CONTROL_SERVER_ADDRESS: ":$GLUETUN_HTTP_CONTROL_SERVER_PORT"
20622062
HEALTH_VPN_DURATION_INITIAL: "120s"
2063+
HEALTH_VPN_DURATION_ADDITION: "120s"
20632064
HEALTH_SUCCESS_WAIT_DURATION: "120s"
20642065
secrets:
20652066
- gluetun_openvpn_user
@@ -2071,7 +2072,7 @@ services:
20712072
## Gluetun - VPN client in a thin Docker container
20722073
## gluetun-private is used for private trackers
20732074
gluetun-private:
2074-
image: ghcr.io/qdm12/gluetun:latest
2075+
image: ghcr.io/qdm12/gluetun:v3
20752076
container_name: gluetun-private
20762077
networks:
20772078
gluetun_net:
@@ -2111,6 +2112,7 @@ services:
21112112
UPDATER_PERIOD: "24h"
21122113
HTTP_CONTROL_SERVER_ADDRESS: ":$GLUETUN_PRIVATE_HTTP_CONTROL_SERVER_PORT"
21132114
HEALTH_VPN_DURATION_INITIAL: "120s"
2115+
HEALTH_VPN_DURATION_ADDITION: "120s"
21142116
HEALTH_SUCCESS_WAIT_DURATION: "120s"
21152117
secrets:
21162118
- gluetun_openvpn_user
@@ -2122,7 +2124,7 @@ services:
21222124
## Gluetun - VPN client in a thin Docker container
21232125
## gluetun-temp is used for temporary files
21242126
gluetun-temp:
2125-
image: ghcr.io/qdm12/gluetun:latest
2127+
image: ghcr.io/qdm12/gluetun:v3
21262128
container_name: gluetun-temp
21272129
networks:
21282130
gluetun_net:
@@ -2162,6 +2164,7 @@ services:
21622164
UPDATER_PERIOD: "24h"
21632165
HTTP_CONTROL_SERVER_ADDRESS: ":$GLUETUN_TEMP_HTTP_CONTROL_SERVER_PORT"
21642166
HEALTH_VPN_DURATION_INITIAL: "120s"
2167+
HEALTH_VPN_DURATION_ADDITION: "120s"
21652168
HEALTH_SUCCESS_WAIT_DURATION: "120s"
21662169
secrets:
21672170
- gluetun_openvpn_user
@@ -2584,7 +2587,7 @@ services:
25842587
## We do not want this to be able to communicate locally (except as
25852588
## specified)
25862589
# <<: *common-keys-apps
2587-
image: lscr.io/linuxserver/qbittorrent:4.6.5
2590+
image: lscr.io/linuxserver/qbittorrent:5.0.4
25882591
container_name: qbit-private
25892592
security_opt:
25902593
- no-new-privileges:true
@@ -2625,7 +2628,7 @@ services:
26252628
## We do not want this to be able to communicate locally (except as
26262629
## specified)
26272630
# <<: *common-keys-apps
2628-
image: lscr.io/linuxserver/qbittorrent:4.6.5
2631+
image: lscr.io/linuxserver/qbittorrent:5.0.4
26292632
container_name: qbit-temp
26302633
security_opt:
26312634
- no-new-privileges:true

0 commit comments

Comments
 (0)