Преглед изворни кода

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

Jakob Ackermann пре 6 година
родитељ
комит
f703b2ca41
1 измењених фајлова са 5 додато и 5 уклоњено
  1. 5 5
      services/clsi/app/js/DockerRunner.js

+ 5 - 5
services/clsi/app/js/DockerRunner.js

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