Use pkgdir inside isolate sandbox to account for packages that have b…

…een built with a custom PREFIX closes #686
engineer-man · Sep 15, 2024 · c4afd97 · c4afd97
1 parent ecdced9
commit c4afd97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/api/src/job.js b/api/src/job.js
@@ -157,7 +157,7 @@ class Job {
                 '-c',
                 '/box/submission',
                 '-e',
-                `--dir=/runtime=${this.runtime.pkgdir}`,
+                `--dir=${this.runtime.pkgdir}`,
                 `--dir=/etc:noexec`,
                 `--processes=${this.runtime.max_process_count}`,
                 `--open-files=${this.runtime.max_open_files}`,
@@ -171,7 +171,7 @@ class Job {
                 ...(config.disable_networking ? [] : ['--share-net']),
                 '--',
                 '/bin/bash',
-                file,
+                path.join(this.runtime.pkgdir, file),
                 ...args,
             ],
             {
@@ -365,7 +365,7 @@ class Job {
             emit_event_bus_stage('compile');
             compile = await this.safe_call(
                 box,
-                '/runtime/compile',
+                'compile',
                 code_files.map(x => x.name),
                 this.timeouts.compile,
                 this.cpu_times.compile,
@@ -390,7 +390,7 @@ class Job {
             emit_event_bus_stage('run');
             run = await this.safe_call(
                 box,
-                '/runtime/run',
+                'run',
                 [code_files[0].name, ...this.args],
                 this.timeouts.run,
                 this.cpu_times.run,

diff --git a/api/src/runtime.js b/api/src/runtime.js
@@ -185,7 +185,6 @@ class Runtime {
                 .split('\n')
                 .map(line => line.split('=', 2))
                 .forEach(([key, val]) => {
-                    val = val.replace_all(this.pkgdir, '/runtime');
                     this._env_vars[key.trim()] = val.trim();
                 });
         }