Skip to content

Commit 1680a9d

Browse files
committed
Merge branch 'master' into AG-38975-upd-proxy
2 parents df42dec + 4d25897 commit 1680a9d

18 files changed

+1100
-591
lines changed

Diff for: CHANGELOG.md

+29-12
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ The format is based on [*Keep a Changelog*](https://keepachangelog.com/en/1.0.0/
99
<!--
1010
## [v0.108.0] – TBA
1111

12-
## [v0.107.60] - 2025-04-01 (APPROX.)
12+
## [v0.107.61] - 2025-04-22 (APPROX.)
1313

14-
See also the [v0.107.60 GitHub milestone][ms-v0.107.60].
14+
See also the [v0.107.61 GitHub milestone][ms-v0.107.61].
1515

16-
[ms-v0.107.60]: https://github.com/AdguardTeam/AdGuardHome/milestone/95?closed=1
16+
[ms-v0.107.61]: https://github.com/AdguardTeam/AdGuardHome/milestone/96?closed=1
1717

1818
NOTE: Add new changes BELOW THIS COMMENT.
1919
-->
@@ -24,8 +24,24 @@ NOTE: Add new changes BELOW THIS COMMENT.
2424

2525
**NOTE:** We thank [Xiang Li][mr-xiang-li] for reporting this security issue. It's strongly recommended to leave it enabled, otherwise AdGuard Home will be vulnerable to untrusted clients.
2626

27+
[mr-xiang-li]: https://lixiang521.com/
28+
29+
<!--
30+
NOTE: Add new changes ABOVE THIS COMMENT.
31+
-->
32+
33+
## [v0.107.60] - 2025-04-14
34+
35+
See also the [v0.107.60 GitHub milestone][ms-v0.107.60].
36+
37+
### Security
38+
2739
- Go version has been updated to prevent the possibility of exploiting the Go vulnerabilities fixed in [1.24.2][go-1.24.2].
2840

41+
### Changed
42+
43+
- Alpine Linux version in `Dockerfile` has been updated to 3.21 ([#7588]).
44+
2945
### Deprecated
3046

3147
- Node 20 support, Node 22 will be required in future releases.
@@ -36,20 +52,20 @@ NOTE: Add new changes BELOW THIS COMMENT.
3652

3753
- Filtering for DHCP clients ([#7734]).
3854

55+
- Incorrect label on login page ([#7729]).
56+
3957
- Validation process for the HTTPS port on the *Encryption Settings* page.
4058

4159
### Removed
4260

4361
- Node 18 support.
4462

63+
[#7588]: https://github.com/AdguardTeam/AdGuardHome/issues/7588
64+
[#7729]: https://github.com/AdguardTeam/AdGuardHome/issues/7729
4565
[#7734]: https://github.com/AdguardTeam/AdGuardHome/issues/7734
4666

47-
[go-1.24.2]: https://groups.google.com/g/golang-announce/c/Y2uBTVKjBQk
48-
[mr-xiang-li]: https://lixiang521.com/
49-
50-
<!--
51-
NOTE: Add new changes ABOVE THIS COMMENT.
52-
-->
67+
[go-1.24.2]: https://groups.google.com/g/golang-announce/c/Y2uBTVKjBQk
68+
[ms-v0.107.60]: https://github.com/AdguardTeam/AdGuardHome/milestone/95?closed=1
5369

5470
## [v0.107.59] - 2025-03-21
5571

@@ -3097,11 +3113,12 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].
30973113
[ms-v0.104.2]: https://github.com/AdguardTeam/AdGuardHome/milestone/28?closed=1
30983114

30993115
<!--
3100-
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.60...HEAD
3101-
[v0.107.60]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.59...v0.107.60
3116+
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.61...HEAD
3117+
[v0.107.61]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.60...v0.107.61
31023118
-->
31033119

3104-
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.59...HEAD
3120+
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.60...HEAD
3121+
[v0.107.60]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.59...v0.107.60
31053122
[v0.107.59]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.58...v0.107.59
31063123
[v0.107.58]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.57...v0.107.58
31073124
[v0.107.57]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.56...v0.107.57

Diff for: bamboo-specs/release.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Make sure to sync any changes with the branch overrides below.
88
'variables':
99
'channel': 'edge'
10-
'dockerFrontend': 'adguard/home-js-builder:3.0'
10+
'dockerFrontend': 'adguard/home-js-builder:3.1'
1111
'dockerGo': 'adguard/go-builder:1.24.2--1'
1212

1313
'stages':
@@ -157,6 +157,7 @@
157157
158158
# Print Docker info.
159159
docker info
160+
docker buildx version
160161
161162
# Prepare and push the build.
162163
env \
@@ -277,7 +278,7 @@
277278
# need to build a few of these.
278279
'variables':
279280
'channel': 'beta'
280-
'dockerFrontend': 'adguard/home-js-builder:3.0'
281+
'dockerFrontend': 'adguard/home-js-builder:3.1'
281282
'dockerGo': 'adguard/go-builder:1.24.2--1'
282283
# release-vX.Y.Z branches are the branches from which the actual final
283284
# release is built.
@@ -293,5 +294,5 @@
293294
# are the ones that actually get released.
294295
'variables':
295296
'channel': 'release'
296-
'dockerFrontend': 'adguard/home-js-builder:3.0'
297+
'dockerFrontend': 'adguard/home-js-builder:3.1'
297298
'dockerGo': 'adguard/go-builder:1.24.2--1'

Diff for: bamboo-specs/test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'key': 'AHBRTSPECS'
66
'name': 'AdGuard Home - Build and run tests'
77
'variables':
8-
'dockerFrontend': 'adguard/home-js-builder:3.0'
8+
'dockerFrontend': 'adguard/home-js-builder:3.1'
99
'dockerGo': 'adguard/go-builder:1.24.2--1'
1010
'channel': 'development'
1111

@@ -233,6 +233,6 @@
233233
# Set the default release channel on the release branch to beta, as we
234234
# may need to build a few of these.
235235
'variables':
236-
'dockerFrontend': 'adguard/home-js-builder:3.0'
236+
'dockerFrontend': 'adguard/home-js-builder:3.1'
237237
'dockerGo': 'adguard/go-builder:1.24.2--1'
238238
'channel': 'candidate'

0 commit comments

Comments
 (0)