mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
change override to leave image name so it works for wl_texlive
This commit is contained in:
parent
a767bfe964
commit
e46b6563c0
2 changed files with 4 additions and 4 deletions
|
@ -39,8 +39,8 @@ module.exports = DockerRunner =
|
|||
image = Settings.clsi.docker.image
|
||||
|
||||
if Settings.texliveImageNameOveride?
|
||||
tag = image.split(":")[1]
|
||||
image = "#{Settings.texliveImageNameOveride}:#{tag}"
|
||||
img = image.split("/")
|
||||
image = "#{Settings.texliveImageNameOveride}/#{img[2]}"
|
||||
|
||||
options = DockerRunner._getContainerOptions(command, image, volumes, timeout, environment)
|
||||
fingerprint = DockerRunner._fingerprintContainer(options)
|
||||
|
|
|
@ -138,13 +138,13 @@ describe "DockerRunner", ->
|
|||
|
||||
describe "with image override", ->
|
||||
beforeEach ->
|
||||
@Settings.texliveImageNameOveride = "overrideimage/here"
|
||||
@Settings.texliveImageNameOveride = "overrideimage.com/something"
|
||||
@DockerRunner._runAndWaitForContainer = sinon.stub().callsArgWith(3, null, @output = "mock-output")
|
||||
@DockerRunner.run @project_id, @command, @directory, @image, @timeout, @env, @callback
|
||||
|
||||
it "should use the override and keep the tag", ->
|
||||
image = @DockerRunner._getContainerOptions.args[0][1]
|
||||
image.should.equal "overrideimage/here:2016.2"
|
||||
image.should.equal "overrideimage.com/something/image:2016.2"
|
||||
|
||||
describe "_runAndWaitForContainer", ->
|
||||
beforeEach ->
|
||||
|
|
Loading…
Reference in a new issue