Merge branch 'develop' of github.com:foomo/contentserver into feature/metrics

This commit is contained in:
Frederik Löffert 2019-05-14 16:43:47 +02:00
commit 5beb586365
2 changed files with 3 additions and 0 deletions

1
.gitignore vendored
View File

@ -2,4 +2,5 @@
*~ *~
/bin/ /bin/
/pkg/tmp/ /pkg/tmp/
/vendor
!.git* !.git*

View File

@ -6,6 +6,8 @@ IMAGE=docker-registry.bestbytes.net/contentserver
all: build test all: build test
tag: tag:
echo $(TAG) echo $(TAG)
dep:
go mod download && go mod vendor && go install -i ./vendor/...
clean: clean:
rm -fv bin/contentserve* rm -fv bin/contentserve*
build: clean build: clean