Merge branch 'master' into AGDNS-4277

Author: IldarKamalov

CHANGELOG.md

@@ -20,6 +20,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Added
 
+- Bootstrap servers configuration now supports comments.
+
 - New property `"language"` in `POST /control/install/check_config` and `POST /control/install/configure` HTTP APIs.
 
 - The user is able to remove the static lease's hostname via the HTTP API.

bamboo-specs/release.yaml

@@ -113,21 +113,29 @@
 
                 docker info
 
+                # Disable xtrace so the expanded secret values aren't printed to
+                # the build log.
+                set +x
+                export GPG_KEY_PASSPHRASE="${bamboo_gpgPassword}"
+                export GPG_SECRET_KEY="${bamboo_gpgSecretKeyPart1}${bamboo_gpgSecretKeyPart2}"
+                export SIGNER_API_KEY="${bamboo_adguardHomeWinSignerSecretApiKey}"
+                set -x
+
                 docker build \
                     --build-arg "BASE_IMAGE=${bamboo_dockerGo}" \
                     --build-arg "BRANCH=${bamboo_planRepository_branchName}" \
                     --build-arg "CACHE_BUSTER=${bamboo_cacheBuster}" \
                     --build-arg "CHANNEL=${bamboo_channel}" \
                     --build-arg "DEPLOY_SCRIPT_PATH=./bamboo-deploy-publisher/deploy.sh" \
-                    --build-arg "GPG_SECRET_KEY=${bamboo_gpgSecretKeyPart1}${bamboo_gpgSecretKeyPart2}" \
-                    --build-arg "GPG_KEY_PASSPHRASE=${bamboo_gpgPassword}" \
                     --build-arg "REVISION=${bamboo_repository_revision_number}" \
                     --build-arg "SIGN=1" \
-                    --build-arg "SIGNER_API_KEY=${bamboo_adguardHomeWinSignerSecretApiKey}" \
                     --build-arg "SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)" \
                     --build-arg "VERSION=$version" \
                     --output '.' \
                     --progress 'plain' \
+                    --secret id=GPG_KEY_PASSPHRASE \
+                    --secret id=GPG_SECRET_KEY \
+                    --secret id=SIGNER_API_KEY \
                     --target 'builder-exporter' \
                     -f ./docker/ci.Dockerfile \
                     .
@@ -151,6 +159,12 @@
 
                 set -e -f -u -x
 
+                # The version.sh script queries the current state of the git
+                # repository, so we must explicitly checkout the revision that
+                # triggered the build to prevent race conditions when the master
+                # branch changes while this build is running.
+                git checkout "${bamboo_repository_revision_number}"
+
                 # Install Qemu, create builder.
                 docker version -f '{{ .Server.Experimental }}'
                 docker buildx rm buildx-builder || :

bamboo-specs/snapcraft.yaml

@@ -98,14 +98,20 @@
 
                 docker info
 
+                # Disable xtrace so the expanded secret values aren't printed to
+                # the build log.
+                set +x
+                export SNAPCRAFT_STORE_CREDENTIALS="${bamboo_snapcraftMacaroonPassword}"
+                set -x
+
                 docker build \
                     --build-arg "BASE_IMAGE=${bamboo_dockerSnap}" \
                     --build-arg "CACHE_BUSTER=${bamboo_cacheBuster}" \
                     --build-arg "SNAPCRAFT_CHANNEL=${bamboo_snapcraftChannel}" \
-                    --build-arg "SNAPCRAFT_STORE_CREDENTIALS=${bamboo_snapcraftMacaroonPassword}" \
                     --build-arg "VERSION=${bamboo_buildNumber}" \
                     --output '.' \
                     --progress 'plain' \
+                    --secret id=SNAPCRAFT_STORE_CREDENTIALS \
                     --target 'publisher' \
                     -f ./docker/snapcraft.Dockerfile \
                     .

bamboo-specs/test.yaml

@@ -171,6 +171,12 @@
 
                 set -e -f -u -x
 
+                # The version.sh script queries the current state of the git
+                # repository, so we must explicitly checkout the revision that
+                # triggered the build to prevent race conditions when the master
+                # branch changes while this build is running.
+                git checkout "${bamboo_repository_revision_number}"
+
                 version="$(env CHANNEL=${bamboo_channel} sh ./scripts/make/version.sh)"
                 readonly version
 

client/src/__locales/en.json

@@ -63,7 +63,7 @@
   "blocking_mode_refused": "REFUSED: Respond with REFUSED code",
   "blocklist": "Blocklist",
   "bootstrap_dns": "Bootstrap DNS servers",
-  "bootstrap_dns_desc": "IP addresses of DNS servers used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams. Comments are not permitted.",
+  "bootstrap_dns_desc": "IP addresses of DNS servers used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams. Empty lines and comments, starting with '#', are ignored.",
   "cache_cleared": "DNS cache successfully cleared",
   "cache_enabled": "Enable cache",
   "cache_enabled_desc": "Store DNS responses locally.",