Cadoles/daddy
Cadoles
/
daddy
19
0
Fork 0
Code Issues 16 Pull Requests Releases Wiki Activity

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

This commit is contained in:
wpetit 2020-07-16 22:51:53 +02:00
parent 99fb4ac6d9 08bd11f4d9
commit 17cd58d68f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

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

2
modd.conf
View File

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