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

[misc] move the image check prior to the base image override

Browse Source
This commit is contained in:
Jakob Ackermann
2020-07-01 10:01:25 +01:00
parent ee0e8066d3
commit 0cecf26569
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/js/DockerRunner.js
View File

@@ -86,11 +86,6 @@ module.exports = DockerRunner = {
;({ image } = Settings.clsi.docker) ;({ image } = Settings.clsi.docker)
} }
if (Settings.texliveImageNameOveride != null) {
const img = image.split('/')
image = `${Settings.texliveImageNameOveride}/${img[2]}`
}
if ( if (
Settings.clsi.docker.allowedImages && Settings.clsi.docker.allowedImages &&
!Settings.clsi.docker.allowedImages.includes(image) !Settings.clsi.docker.allowedImages.includes(image)
@@ -98,6 +93,11 @@ module.exports = DockerRunner = {
return callback(new Error('image not allowed')) return callback(new Error('image not allowed'))
} }
if (Settings.texliveImageNameOveride != null) {
const img = image.split('/')
image = `${Settings.texliveImageNameOveride}/${img[2]}`
}
const options = DockerRunner._getContainerOptions( const options = DockerRunner._getContainerOptions(
command, command,
image, image,