From 0cecf2656981141e8951ac8aafca6a1c07c972a9 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 1 Jul 2020 10:01:25 +0100 Subject: [PATCH] [misc] move the image check prior to the base image override --- app/js/DockerRunner.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/js/DockerRunner.js b/app/js/DockerRunner.js index 5f04fe0..49c7f40 100644 --- a/app/js/DockerRunner.js +++ b/app/js/DockerRunner.js @@ -86,11 +86,6 @@ module.exports = DockerRunner = { ;({ image } = Settings.clsi.docker) } - if (Settings.texliveImageNameOveride != null) { - const img = image.split('/') - image = `${Settings.texliveImageNameOveride}/${img[2]}` - } - if ( Settings.clsi.docker.allowedImages && !Settings.clsi.docker.allowedImages.includes(image) @@ -98,6 +93,11 @@ module.exports = DockerRunner = { return callback(new Error('image not allowed')) } + if (Settings.texliveImageNameOveride != null) { + const img = image.split('/') + image = `${Settings.texliveImageNameOveride}/${img[2]}` + } + const options = DockerRunner._getContainerOptions( command, image,