liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: various docker issues

Browse Source
This commit is contained in:
Nicolas Giard
2018-12-08 20:51:55 -05:00
parent 157110ed90
commit 461f4a7e02
7 changed files with 201 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -23,18 +23,18 @@ test: ## Run code linting tests
pug-lint server/views && jest
docker-dev-up: ## Run dockerized dev environment
docker-compose up -d
docker-compose exec wiki yarn dev
docker-compose -f ./dev/docker/docker-compose.yml -p wiki --project-directory . up -d
docker-compose -f ./dev/docker/docker-compose.yml -p wiki --project-directory . exec wiki yarn dev
docker-dev-down: ## Shutdown dockerized dev environment
docker-compose down
docker-compose -f ./dev/docker/docker-compose.yml -p wiki --project-directory . down
docker-dev-rebuild: ## Rebuild dockerized dev image
docker-compose build
docker-compose -f ./dev/docker/docker-compose.yml -p wiki --project-directory . build --no-cache --force-rm
docker-build: ## Run assets generation build in docker
docker-compose run wiki yarn build
docker-compose down
docker-compose -f ./dev/docker/docker-compose.yml -p wiki --project-directory . run wiki yarn build
docker-compose -f ./dev/docker/docker-compose.yml -p wiki --project-directory . down
help: ## Display help
@echo ''