all: resync with master

AdguardTeam · Jul 3, 2024 · 5c6bb33 · 5c6bb33
1 parent 158d4f0
commit 5c6bb33
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 269 deletions.
diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
@@ -265,8 +265,8 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
-            'dockerFrontend': '${bamboo.adguardRegistryBasePath}/home-js-builder:2.0'
-            'dockerGo': '${bamboo.adguardRegistryBasePath}/go-builder:1.22.5--1'
+            'dockerFrontend': 'adguard/home-js-builder:2.0'
+            'dockerGo': 'adguard/go-builder:1.22.5--1'
     # release-vX.Y.Z branches are the branches from which the actual final
     # release is built.
   - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -281,5 +281,5 @@
         # are the ones that actually get released.
         'variables':
             'channel': 'release'
-            'dockerFrontend': '${bamboo.adguardRegistryBasePath}/home-js-builder:2.0'
-            'dockerGo': '${bamboo.adguardRegistryBasePath}/go-builder:1.22.5--1'
+            'dockerFrontend': 'adguard/home-js-builder:2.0'
+            'dockerGo': 'adguard/go-builder:1.22.5--1'
diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
@@ -194,6 +194,6 @@
         # Set the default release channel on the release branch to beta, as we
         # may need to build a few of these.
         'variables':
-            'dockerFrontend': '${bamboo.adguardRegistryBasePath}/home-js-builder:2.0'
-            'dockerGo': '${bamboo.adguardRegistryBasePath}/go-builder:1.22.5--1'
+            'dockerFrontend': 'adguard/home-js-builder:2.0'
+            'dockerGo': 'adguard/go-builder:1.22.5--1'
             'channel': 'candidate'
diff --git a/internal/dnsforward/recursiondetector.go b/internal/dnsforward/recursiondetector.go
diff --git a/internal/dnsforward/recursiondetector_test.go b/internal/dnsforward/recursiondetector_test.go