Merge branch 'master' into 2662-dnscrypt-logs

heyxkhoa · Feb 11, 2021 · ee0b8c5 · ee0b8c5
2 parents aaa8c6b + e64df20
commit ee0b8c5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,10 +19,14 @@ and this project adheres to
 
 ### Fixed
 
+- Incorrect version tag in the Docker release ([#2663]).
 - DNSCrypt queries incorrectly marked as "Plain DNS" in logs ([#2662]).
 
+[#2663]: https://github.com/AdguardTeam/AdGuardHome/issues/2663
 [#2662]: https://github.com/AdguardTeam/AdGuardHome/issues/2662
 
+
+
 ## [v0.105.0] - 2021-02-10
 
 ### Added

diff --git a/scripts/make/build-docker.sh b/scripts/make/build-docker.sh
@@ -17,7 +17,16 @@ set -e -f -u
 readonly channel="$CHANNEL"
 readonly commit="$COMMIT"
 readonly dist_dir="$DIST_DIR"
-readonly version="$VERSION"
+
+if [ "${VERSION:-}" = 'v0.0.0' -o "${VERSION:-}" = '' ]
+then
+	readonly version="$(sh ./scripts/make/version.sh)"
+else
+	readonly version="$VERSION"
+fi
+
+echo $version
+exit 0
 
 # Allow users to use sudo.
 readonly sudo_cmd="${SUDO:-}"