Merge 4581f3e966 into 1d55a41a2d

api/src/job.js

@@ -156,7 +156,11 @@ class Job {
                 '-s',
                 '-c',
                 '/box/submission',
-                '-e',
+                '-E',
+                'HOME=/tmp',
+                ...this.runtime.env_vars.flat_map(v => ['-E', v]),
+                '-E',
+                `PISTON_LANGUAGE=${this.runtime.language}`,
                 `--dir=${this.runtime.pkgdir}`,
                 `--dir=/etc:noexec`,
                 `--processes=${this.runtime.max_process_count}`,
@@ -175,10 +179,6 @@ class Job {
                 ...args,
             ],
             {
-                env: {
-                    ...this.runtime.env_vars,
-                    PISTON_LANGUAGE: this.runtime.language,
-                },
                 stdio: 'pipe',
             }
         );

api/src/runtime.js

@@ -178,15 +178,7 @@ class Runtime {
             const env_file = path.join(this.pkgdir, '.env');
             const env_content = fss.read_file_sync(env_file).toString();
 
-            this._env_vars = {};
+            this._env_vars = env_content.trim().split('\n');
-
-            env_content
-                .trim()
-                .split('\n')
-                .map(line => line.split('=', 2))
-                .forEach(([key, val]) => {
-                    this._env_vars[key.trim()] = val.trim();
-                });
         }
 
         return this._env_vars;

packages/node/22.4.0/build.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+curl "https://nodejs.org/dist/v22.4.0/node-v22.4.0-linux-x64.tar.xz" -o node.tar.xz
+tar xf node.tar.xz --strip-components=1
+rm node.tar.xz

packages/node/22.4.0/environment

@@ -0,0 +1 @@
+export PATH=$PWD/bin:$PATH

packages/node/22.4.0/metadata.json

@@ -0,0 +1,10 @@
+{
+    "language": "node",
+    "version": "22.4.0",
+    "provides": [
+        {
+            "language": "javascript",
+            "aliases": ["node-javascript", "node-js", "javascript", "js"]
+        }
+    ]
+}

packages/node/22.4.0/run

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+node "$@"

packages/node/22.4.0/test.js

@@ -0,0 +1 @@
+console.log('OK');

packages/typescript/5.5.3/build.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+source ../../node/22.4.0/build.sh
+
+source ./environment
+
+bin/npm install -g typescript@5.5.3

packages/typescript/5.5.3/compile

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Put instructions to compile source code, remove this file if the language does not require this stage
+
+rename 's/$/\.ts/' "$@" # Add .ts extension
+
+tsc *.ts

packages/typescript/5.5.3/environment

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# Put 'export' statements here for environment variables
+export PATH=$PWD/bin:$PATH

packages/typescript/5.5.3/metadata.json

@@ -0,0 +1,5 @@
+{
+    "language": "typescript",
+    "version": "5.5.3",
+    "aliases": ["ts", "node-ts", "tsc", "typescript5", "ts5"]
+}

packages/typescript/5.5.3/run

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Put instructions to run the runtime
+
+CODE=$1.js
+shift
+
+node $CODE "$@"

packages/typescript/5.5.3/test.ts

@@ -0,0 +1 @@
+console.log('OK');