diff options
| author | Markus Heiser <markus.heiser@darmarIT.de> | 2020-04-02 13:20:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 13:20:40 +0000 |
| commit | 07932951f2c5d5ab7c89a78f389db2a9008d7631 (patch) | |
| tree | 5729cb858b58ab80e8966cd4895a033270498e69 | |
| parent | 8189e18d91e55388cec48d73a9d7648b1c148d0b (diff) | |
| parent | 4dad3661461659dd39f88795f461fc19ac9c1fb5 (diff) | |
Merge pull request #1911 from dalf/docker-tag-fix
[fix] travis: fix docker tag.
| -rwxr-xr-x | manage.sh | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -121,8 +121,9 @@ docker_build() { SEARX_GIT_VERSION=$(git describe --match "v[0-9]*\.[0-9]*\.[0-9]*" HEAD 2>/dev/null | awk -F'-' '{OFS="-"; $1=substr($1, 2); $3=substr($3, 2); print}') # add the suffix "-dirty" if the repository has uncommited change + # /!\ HACK for searx/searx: ignore searx/brand.py and utils/brand.env git update-index -q --refresh - if [ ! -z "$(git diff-index --name-only HEAD --)" ]; then + if [ ! -z "$(git diff-index --name-only HEAD -- | grep -v 'searx/brand.py' | grep -v 'utils/brand.env')" ]; then SEARX_GIT_VERSION="${SEARX_GIT_VERSION}-dirty" fi |