github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1365 from erik-wramner/fix_vcs_version_1364

Browse source 
Generate correct VCS_VERSION #1364
This commit is contained in:
Erik Wramner 2020-01-12 13:02:23 +01:00 committed by GitHub
parent f69d30f62a d7c8810c65
commit a559631641
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
NAME = tvial/docker-mailserver:testing NAME = tvial/docker-mailserver:testing
VCS_REF := $(shell git rev-parse --short HEAD) 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 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 no-build: backup generate-accounts run generate-accounts-after-run fixtures tests clean

2
hooks/build
View file

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