summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDan Morrill <morrildl@gmail.com>2017-02-23 17:33:09 -0800
committerLunny Xiao <xiaolunwen@gmail.com>2017-02-24 09:33:09 +0800
commit832477b1bceb003ce12529c7797a53e80c936d58 (patch)
treed1bc7d16172076687a867dcd85496c67788568c3 /Makefile
parent490d3771f7b6a6947d54dbf1f761bfec5dba0709 (diff)
downloadgitea-832477b1bceb003ce12529c7797a53e80c936d58.tar.gz
gitea-832477b1bceb003ce12529c7797a53e80c936d58.zip
Tweak docker target to work by default. (#1033)
Fix for #1013: adds "bindata" to tags by default, as without this the resulting docker image won't start, as it doesn't contain locale files. Verified to work even if you specify TAGS="bindata" such that it appears twice.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 14afb05bfb..e34fd9dc0b 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ $(EXECUTABLE): $(SOURCES)
.PHONY: docker
docker:
- docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="$(TAGS)" webhippie/golang:edge make clean generate build
+ docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" webhippie/golang:edge make clean generate build
docker build -t gitea/gitea:latest .
.PHONY: release