diff --git a/Jenkinsfile b/Jenkinsfile index bc9ba01..8607d39 100644 --- a/Jenkinsfile +++ b/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' } } diff --git a/config/settings.defaults.coffee b/config/settings.defaults.coffee index c76b251..3100a5d 100644 --- a/config/settings.defaults.coffee +++ b/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") diff --git a/docker-compose-config.yml b/docker-compose-config.yml index 55a3f01..f2bb863 100644 --- a/docker-compose-config.yml +++ b/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 \ No newline at end of file diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 2ca2f9a..98715c2 100644 --- a/docker-compose.ci.yml +++ b/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 diff --git a/install_deps.sh b/install_deps.sh index bde142a..dce17a4 100755 --- a/install_deps.sh +++ b/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