From 832477b1bceb003ce12529c7797a53e80c936d58 Mon Sep 17 00:00:00 2001 From: Dan Morrill Date: Thu, 23 Feb 2017 17:33:09 -0800 Subject: [PATCH] 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. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 14afb05bfb44..e34fd9dc0b41 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