Merge ebf8fc7735 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 = {};
-
-            env_content
-                .trim()
-                .split('\n')
-                .map(line => line.split('=', 2))
-                .forEach(([key, val]) => {
-                    this._env_vars[key.trim()] = val.trim();
-                });
+            this._env_vars = env_content.trim().split('\n');
         }
 
         return this._env_vars;

packages/java/20.0.1/build.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Put instructions to build your package in here
+
+curl "https://download.java.net/java/GA/jdk20.0.1/b4887098932d415489976708ad6d1a4b/9/GPL/openjdk-20.0.1_linux-x64_bin.tar.gz" -o java.tar.gz
+
+tar xzf java.tar.gz --strip-components=1
+rm java.tar.gz
+

packages/java/20.0.1/environment

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

packages/java/20.0.1/metadata.json

@@ -0,0 +1,5 @@
+{
+    "language": "java",
+    "version": "20.0.1",
+    "aliases": []
+}

packages/java/20.0.1/run

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Put instructions to run the runtime
+mv $1 $1.java
+filename=$1.java
+shift
+java $filename "$@"

packages/java/20.0.1/test.java

@@ -0,0 +1,5 @@
+public class HelloWorld {
+    public static void main(String[] args) {
+        System.out.println("OK");
+    }
+}

packages/java/20.valhalla.20.75/build.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Put instructions to build your package in here
+
+curl "https://download.java.net/java/early_access/valhalla/20/openjdk-20-valhalla+20-75_linux-x64_bin.tar.gz" -o java.tar.gz
+
+tar xzf java.tar.gz --strip-components=1
+rm java.tar.gz
+

packages/java/20.valhalla.20.75/environment

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

packages/java/20.valhalla.20.75/metadata.json

@@ -0,0 +1,5 @@
+{
+    "language": "java",
+    "version": "20.valhalla.20.75",
+    "aliases": []
+}

packages/java/20.valhalla.20.75/run

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Put instructions to run the runtime
+mv $1 $1.java
+filename=$1.java
+shift
+java --enable-preview $filename "$@"

packages/java/20.valhalla.20.75/test.java

@@ -0,0 +1,5 @@
+public class HelloWorld {
+    public static void main(String[] args) {
+        System.out.println("OK");
+    }
+}

packages/java/21.ea.22/build.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Put instructions to build your package in here
+
+curl "https://download.java.net/java/early_access/jdk21/22/GPL/openjdk-21-ea+22_linux-x64_bin.tar.gz" -o java.tar.gz
+
+tar xzf java.tar.gz --strip-components=1
+rm java.tar.gz
+

packages/java/21.ea.22/environment

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

packages/java/21.ea.22/metadata.json

@@ -0,0 +1,5 @@
+{
+    "language": "java",
+    "version": "21.ea.22",
+    "aliases": []
+}

packages/java/21.ea.22/run

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Put instructions to run the runtime
+mv $1 $1.java
+filename=$1.java
+shift
+java --enable-preview $filename "$@"

packages/java/21.ea.22/test.java

@@ -0,0 +1,5 @@
+class Main {
+    public static void main(String[] args) {
+    	System.out.println("OK");
+    }
+}