github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-17 03:12:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ho-dockerise' of github.com:sharelatex/clsi-sharelatex into ho-dockerise

Browse source
This commit is contained in:
Henry Oswald 2018-05-25 15:33:08 +01:00
commit e8ec175bf1
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
services/clsi/bin/synctex
View file

Binary file not shown.

3
services/clsi/config/settings.defaults.coffee
View file

@ -46,4 +46,5 @@ if process.env["DOCKER_RUNNER"]
module.exports.path.sandboxedCompilesHostDir = process.env["COMPILES_HOST_DIR"] module.exports.path.sandboxedCompilesHostDir = process.env["COMPILES_HOST_DIR"]
module.exports.path.synctexBinHostPath = process.env["SYNCTEX_BIN_HOST_PATH"] module.exports.path.synctexBinHostPath = process.env["SYNCTEX_BIN_HOST_PATH"]
console.log module.exports console.log "configggggg"
console.log module.exports

7
services/clsi/docker-compose-config.yml
View file

@ -4,7 +4,7 @@ services:
dev: dev:
environment: environment:
TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1 TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
TEXLIVE_IMAGE_USER: root TEXLIVE_IMAGE_USER: "tex"
SHARELATEX_CONFIG: /app/config/settings.defaults.coffee SHARELATEX_CONFIG: /app/config/settings.defaults.coffee
DOCKER_RUNNER: "true" DOCKER_RUNNER: "true"
COMPILES_HOST_DIR: $PWD/compiles COMPILES_HOST_DIR: $PWD/compiles
@ -13,12 +13,13 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- ./compiles:/app/compiles - ./compiles:/app/compiles
- ./cache:/app/cache - ./cache:/app/cache
- ./bin/synctex:/app/bin/synctex
ci: ci:
environment: environment:
TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1 TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
TEXLIVE_IMAGE_USER: tex TEXLIVE_IMAGE_USER: "tex"
SHARELATEX_CONFIG: /app/config/settings.defaults.coffee SHARELATEX_CONFIG: /app/config/settings.defaults.coffee
DOCKER_RUNNER: "true" DOCKER_RUNNER: "true"
COMPILES_HOST_DIR: $PWD/compiles COMPILES_HOST_DIR: $PWD/compiles
@ -26,4 +27,6 @@ services:
SQLITE_PATH: /app/compiles/db.sqlite SQLITE_PATH: /app/compiles/db.sqlite
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:rw - /var/run/docker.sock:/var/run/docker.sock:rw
- ./compiles:/app/compiles
- ./cache:/app/cache - ./cache:/app/cache
- ./bin/synctex:/app/bin/synctex