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

quick hack to overright image name further down stack

Browse Source
This commit is contained in:
Henry Oswald
2018-07-13 11:46:37 +01:00
parent 7fc9412141
commit 3545852173
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/coffee/DockerRunner.coffee
View File

@@ -38,6 +38,10 @@ module.exports = DockerRunner =
if !image? if !image?
image = Settings.clsi.docker.image image = Settings.clsi.docker.image
if Settings.texliveImageNameOveride?
tag = image.split(":")[1]
image = "#{Settings.texliveImageNameOveride}:#{tag}"
options = DockerRunner._getContainerOptions(command, image, volumes, timeout, environment) options = DockerRunner._getContainerOptions(command, image, volumes, timeout, environment)
fingerprint = DockerRunner._fingerprintContainer(options) fingerprint = DockerRunner._fingerprintContainer(options)
options.name = name = "project-#{project_id}-#{fingerprint}" options.name = name = "project-#{project_id}-#{fingerprint}"

2
app/coffee/RequestParser.coffee
View File

@@ -69,7 +69,7 @@ module.exports = RequestParser =
sanitizedRootResourcePath = RequestParser._sanitizePath(rootResourcePath) sanitizedRootResourcePath = RequestParser._sanitizePath(rootResourcePath)
response.rootResourcePath = RequestParser._checkPath(sanitizedRootResourcePath) response.rootResourcePath = RequestParser._checkPath(sanitizedRootResourcePath)
if settings.texliveImageNameOveride? if settings.texliveImageNameOveride? and compile.options?.imageName?
tag = compile.options.imageName.split(":")[1] tag = compile.options.imageName.split(":")[1]
response.imageName = "#{settings.texliveImageNameOveride}:#{tag}" response.imageName = "#{settings.texliveImageNameOveride}:#{tag}"