a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request #991: scripts: fix docker version handling 

Merge in DNS/adguard-home from 2663-docker-version to master

Closes #2663.

Squashed commit of the following:

commit f9b03fd12543a3975ea6dc45115e4ec0f73eba1e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 11 12:40:06 2021 +0300

    all: document changes

commit 8bce414c9f25210420b6026cb4c21908c8b9c74f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 11 12:22:45 2021 +0300

    scripts: fix docker version handling
This commit is contained in:
Ainar Garipov 2021-02-11 12:55:23 +03:00
parent 890f0322d8
commit e64df20e74
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -17,6 +17,12 @@ and this project adheres to
## [v0.105.1] - 2021-02-24 ## [v0.105.1] - 2021-02-24
--> -->
### Fixed
- Incorrect version tag in the Docker release ([#2663]).
[#2663]: https://github.com/AdguardTeam/AdGuardHome/issues/2663
## [v0.105.0] - 2021-02-10 ## [v0.105.0] - 2021-02-10
### Added ### Added

11
scripts/make/build-docker.sh
View File

@ -17,7 +17,16 @@ set -e -f -u
readonly channel="$CHANNEL" readonly channel="$CHANNEL"
readonly commit="$COMMIT" readonly commit="$COMMIT"
readonly dist_dir="$DIST_DIR" 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. # Allow users to use sudo.
readonly sudo_cmd="${SUDO:-}" readonly sudo_cmd="${SUDO:-}"