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

update scripts from latest build scripts 1.1.0

Browse Source
This commit is contained in:
Henry Oswald
2018-03-06 12:07:54 +00:00
parent 3c4870f688
commit 7dbed15fea
6 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -28,13 +28,12 @@ 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
@@ -43,7 +42,7 @@ ci:
BRANCH_NAME=$(BRANCH_NAME) \
BUILD_NUMBER=$(BUILD_NUMBER) \
DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" \
$(MAKE) build test
$(MAKE) build test publish
.PHONY: clean test test_unit test_acceptance test_clean build publish