Generate correct VCS_VERSION #1364

This commit is contained in:
Erik Wramner 2020-01-12 12:09:29 +01:00
parent f69d30f62a
commit d7c8810c65
2 changed files with 2 additions and 2 deletions

View file

@ -1,6 +1,6 @@
NAME = tvial/docker-mailserver:testing
VCS_REF := $(shell git rev-parse --short HEAD)
VCS_VERSION := $(shell git describe)
VCS_VERSION := $(shell git describe --tags --contains --always)
all: build backup generate-accounts run generate-accounts-after-run fixtures tests clean
no-build: backup generate-accounts run generate-accounts-after-run fixtures tests clean

View file

@ -1,6 +1,6 @@
#!/bin/sh
VCS_REF=$(git rev-parse --short HEAD)
VCS_VERSION=$(git describe)
VCS_VERSION=$(git describe --tags --contains --always)
docker build \
--build-arg VCS_REF="$VCS_REF" \