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

removed user temporarly, created make ci task

Browse Source
This commit is contained in:
Henry Oswald
2018-03-06 10:30:05 +00:00
parent 4e6514b17e
commit 96a237fb74
5 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -28,10 +28,22 @@ test_acceptance: test_clean # clear the database before each acceptance test run
test_clean:
$(DOCKER_COMPOSE) down -t 0
build:
docker build --pull --tag quay.io/sharelatex/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) .
publish:
docker push quay.io/sharelatex/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
ci:
# On the CI server, we want to run our tests in the image that we
# have built for deployment, which is what the docker-compose.ci.yml
# override does.
PROJECT_NAME=$(PROJECT_NAME) \
BRANCH_NAME=$(BRANCH_NAME) \
BUILD_NUMBER=$(BUILD_NUMBER) \
DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" \
$(MAKE) build test
.PHONY: clean test test_unit test_acceptance test_clean build publish