Henry Oswald 8 лет назад
Родитель
Сommit
8dce1e2958

+ 1 - 1
services/clsi/Jenkinsfile

@@ -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'
       }
     }
 

+ 1 - 1
services/clsi/config/settings.defaults.coffee

@@ -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")

+ 1 - 0
services/clsi/docker-compose-config.yml

@@ -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

+ 1 - 1
services/clsi/docker-compose.ci.yml

@@ -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

+ 2 - 0
services/clsi/install_deps.sh

@@ -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