wip for ci

This commit is contained in:
Henry Oswald 2018-03-05 15:29:12 +00:00
parent 9a519f0d3d
commit 8dce1e2958
5 changed files with 6 additions and 3 deletions

View file

@ -23,7 +23,7 @@ pipeline {
stage('Acceptance Tests') {
steps {
sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_acceptance'
sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" test_acceptance'
}
}

View file

@ -9,7 +9,7 @@ module.exports =
username: "clsi"
password: null
dialect: "sqlite"
storage: Path.resolve(__dirname + "/../db.sqlite")
storage: process.env["SQLITE_PATH"] or Path.resolve(__dirname + "/../db.sqlite")
path:
compilesDir: Path.resolve(__dirname + "/../compiles")

View file

@ -21,6 +21,7 @@ services:
DOCKER_RUNNER: "true"
COMPILES_HOST_DIR: $PWD/compiles
SYNCTEX_BIN_HOST_PATH: $PWD/bin/synctex
SQLITE_PATH: /app/compiles/db.sqlite
volumes:
- /var/run/docker.sock:/var/run/docker.sock:rw
- ./compiles:/app/compiles

View file

@ -15,7 +15,7 @@ services:
image: quay.io/sharelatex/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
extends:
file: docker-compose-config.yml
service: dev
service: ci
environment:
REDIS_HOST: redis
MONGO_HOST: mongo

View file

@ -6,3 +6,5 @@ usermod -aG docker app
touch /var/run/docker.sock
chown root:docker /var/run/docker.sock
chown -R app:app /app/cache