Craftadoc/clsi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update build script and add load balancer agent

Browse Source
This commit is contained in:
Henry Oswald
2018-03-29 12:12:29 +01:00
parent ec75f9fa67
commit b5a7eabaab
13 changed files with 184 additions and 3628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -21,13 +21,13 @@ clean:
test: test_unit test_acceptance
test_unit:
@[ -d test/unit ] && $(DOCKER_COMPOSE) run --rm test_unit -- ${MOCHA_ARGS} || echo "clsi has no unit tests"
@[ ! -d test/unit ] && echo "clsi has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit -- ${MOCHA_ARGS}
test_acceptance: test_clean # clear the database before each acceptance test run
@[ -d test/acceptance ] && $(DOCKER_COMPOSE) run --rm test_acceptance -- ${MOCHA_ARGS} || echo "clsi has no acceptance tests"
@[ ! -d test/acceptance ] && echo "clsi has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance -- ${MOCHA_ARGS}
test_clean:
$(DOCKER_COMPOSE) down -t 0
$(DOCKER_COMPOSE) down -t -v 0
build:
docker build --pull --tag quay.io/sharelatex/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) .