Craftadoc/clsi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't put synctex in as a volume

Browse Source
This commit is contained in:
Henry Oswald
2018-03-16 18:11:46 +00:00
parent 0bd9377018
commit 8ccbfc7d32
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/coffee/DockerRunner.coffee
View File

@@ -108,9 +108,6 @@ module.exports = DockerRunner =
_getContainerOptions: (command, image, volumes, timeout, environment) -> _getContainerOptions: (command, image, volumes, timeout, environment) ->
timeoutInSeconds = timeout / 1000 timeoutInSeconds = timeout / 1000
if Settings.path?.synctexBinHostPath?
volumes[Settings.path.synctexBinHostPath] = "/opt/synctex:ro"
dockerVolumes = {} dockerVolumes = {}
for hostVol, dockerVol of volumes for hostVol, dockerVol of volumes
dockerVolumes[dockerVol] = {} dockerVolumes[dockerVol] = {}
@@ -118,7 +115,6 @@ module.exports = DockerRunner =
if volumes[hostVol].slice(-3).indexOf(":r") == -1 if volumes[hostVol].slice(-3).indexOf(":r") == -1
volumes[hostVol] = "#{dockerVol}:rw" volumes[hostVol] = "#{dockerVol}:rw"
# merge settings and environment parameter # merge settings and environment parameter
env = {} env = {}
for src in [Settings.clsi.docker.env, environment or {}] for src in [Settings.clsi.docker.env, environment or {}]
@@ -144,8 +140,13 @@ module.exports = DockerRunner =
"Ulimits": [{'Name': 'cpu', 'Soft': timeoutInSeconds+5, 'Hard': timeoutInSeconds+10}] "Ulimits": [{'Name': 'cpu', 'Soft': timeoutInSeconds+5, 'Hard': timeoutInSeconds+10}]
"CapDrop": "ALL" "CapDrop": "ALL"
"SecurityOpt": ["no-new-privileges"] "SecurityOpt": ["no-new-privileges"]
if Settings.clsi.docker.seccomp_profile? if Settings.clsi.docker.seccomp_profile?
options.HostConfig.SecurityOpt.push "seccomp=#{Settings.clsi.docker.seccomp_profile}" options.HostConfig.SecurityOpt.push "seccomp=#{Settings.clsi.docker.seccomp_profile}"
if Settings.path?.synctexBinHostPath?
options["HostConfig"]["Binds"].push("#{Settings.path.synctexBinHostPath}:/opt/synctex:ro")
logger.log options:options, "options for running docker container" logger.log options:options, "options for running docker container"
return options return options

1
bin/install_texlive_gce.sh
View File

@@ -9,6 +9,7 @@ fi
docker login -u '_token' -p $ACCESS_TOKEN https://gcr.io docker login -u '_token' -p $ACCESS_TOKEN https://gcr.io
docker pull --all-tags gcr.io/henry-terraform-admin/texlive-full #TODO NEED TO MAKE THIS AN ENV VAR docker pull --all-tags gcr.io/henry-terraform-admin/texlive-full #TODO NEED TO MAKE THIS AN ENV VAR
cp /app/bin/synctex /app/bin/synctex-mount/synctex cp /app/bin/synctex /app/bin/synctex-mount/synctex
echo "Finished downloading texlive-full images" echo "Finished downloading texlive-full images"