Просмотр исходного кода

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

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

BIN
services/clsi/bin/synctex


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

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

+ 5 - 2
services/clsi/docker-compose-config.yml

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