Trying to make the wrapper work

Together-Java · Sep 17, 2023 · 51c5d51 · 51c5d51
1 parent 6d11aa2
commit 51c5d51
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 333 deletions.
diff --git a/JShellAPI/gradlew b/JShellAPI/gradlew
diff --git a/JShellAPI/gradlew.bat b/JShellAPI/gradlew.bat
diff --git a/JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java b/JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java
@@ -51,13 +51,12 @@ public JShellService(JShellSessionService sessionService, String id, long timeou
                     "--cap-drop=ALL",
                     "--network=none",
                     "--pids-limit=2000",
-                    "--memory=500M",
                     "--read-only",
                     "--memory=" + maxMemory + "m",
                     "--cpus=" + cpus,
                     "--name", containerName(),
-                    "jshellwrapper",
-                    "java", "-DevalTimeoutSeconds=%d".formatted(evalTimeout), "-jar", "JShellWrapper.jar")
+                    "-e", "\"evalTimeoutSeconds=%d\"".formatted(evalTimeout),
+                    "togetherjava.org:5001/togetherjava/jshellwrapper:master")
                     .directory(new File(".."))
                     .redirectError(errorLogs.toFile())
                     .start();

diff --git a/JShellWrapper/build.gradle b/JShellWrapper/build.gradle
@@ -2,6 +2,8 @@ import org.gradle.jvm.toolchain.JavaLanguageVersion
 
 plugins {
     id 'java'
+    id 'com.google.cloud.tools.jib' version '3.3.2'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 group 'org.togetherjava'
@@ -13,6 +15,30 @@ java {
     }
 }
 
+var outputImage = 'togetherjava.org:5001/togetherjava/jshellwrapper:master' ?: 'latest'
+
+jib {
+    from.image = 'eclipse-temurin:20'
+    to {
+        image = outputImage
+        auth {
+            username = System.getenv('ORG_REGISTRY_USER') ?: ''
+            password = System.getenv('ORG_REGISTRY_PASSWORD') ?: ''
+        }
+    }
+    container {
+        ports = [ "8081-8081" ]
+        mainClass = 'Main'
+        setCreationTime(java.time.Instant.now().toString())
+    }
+}
+
+shadowJar {
+    archiveBaseName.set('JShellWrapper')
+    archiveClassifier.set('')
+    archiveVersion.set('')
+}
+
 repositories {
     mavenCentral()
 }

diff --git a/JShellWrapper/gradle/wrapper/gradle-wrapper.properties b/JShellWrapper/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists