Merge branch 'develop' into dist/ubuntu/bionic/develop

Makefile

@@ -1,8 +1,8 @@
 SHELL := /bin/bash
 
-build: build-docker build-server
+build: build-server
 
-build-docker:
+docker:
 	docker-compose build
 
 generate:
@@ -52,7 +52,7 @@ hydra-shell:
 release:
 	./misc/script/release
 
-clean: down
+clean:
 	rm -rf client/node_modules bin data .env internal/graph/generated internal/graph/server.go
 	rm -rf vendor
 	go clean -modcache

modd.conf

@@ -8,7 +8,7 @@ internal/gqlgen.yml {
 data/config.yml
 .env
 modd.conf {
-  prep: make build-server
+  prep: make build
   prep: [ -e data/config.yml ] || ( mkdir -p data && bin/server -dump-config > data/config.yml )
   prep: [ -e .env ] || ( cp .env.dist .env )
   prep:  make migrate-latest