Skip to content

Commit 51c5d51

Browse files
committed
Trying to make the wrapper work
1 parent 6d11aa2 commit 51c5d51

7 files changed

Lines changed: 41 additions & 333 deletions

File tree

JShellAPI/gradlew

Lines changed: 0 additions & 234 deletions
This file was deleted.

JShellAPI/gradlew.bat

Lines changed: 0 additions & 89 deletions
This file was deleted.

JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ public JShellService(JShellSessionService sessionService, String id, long timeou
5151
"--cap-drop=ALL",
5252
"--network=none",
5353
"--pids-limit=2000",
54-
"--memory=500M",
5554
"--read-only",
5655
"--memory=" + maxMemory + "m",
5756
"--cpus=" + cpus,
5857
"--name", containerName(),
59-
"jshellwrapper",
60-
"java", "-DevalTimeoutSeconds=%d".formatted(evalTimeout), "-jar", "JShellWrapper.jar")
58+
"-e", "\"evalTimeoutSeconds=%d\"".formatted(evalTimeout),
59+
"togetherjava.org:5001/togetherjava/jshellwrapper:master")
6160
.directory(new File(".."))
6261
.redirectError(errorLogs.toFile())
6362
.start();

JShellWrapper/build.gradle

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import org.gradle.jvm.toolchain.JavaLanguageVersion
22

33
plugins {
44
id 'java'
5+
id 'com.google.cloud.tools.jib' version '3.3.2'
6+
id 'com.github.johnrengelman.shadow' version '8.1.1'
57
}
68

79
group 'org.togetherjava'
@@ -13,6 +15,30 @@ java {
1315
}
1416
}
1517

18+
var outputImage = 'togetherjava.org:5001/togetherjava/jshellwrapper:master' ?: 'latest'
19+
20+
jib {
21+
from.image = 'eclipse-temurin:20'
22+
to {
23+
image = outputImage
24+
auth {
25+
username = System.getenv('ORG_REGISTRY_USER') ?: ''
26+
password = System.getenv('ORG_REGISTRY_PASSWORD') ?: ''
27+
}
28+
}
29+
container {
30+
ports = [ "8081-8081" ]
31+
mainClass = 'Main'
32+
setCreationTime(java.time.Instant.now().toString())
33+
}
34+
}
35+
36+
shadowJar {
37+
archiveBaseName.set('JShellWrapper')
38+
archiveClassifier.set('')
39+
archiveVersion.set('')
40+
}
41+
1642
repositories {
1743
mavenCentral()
1844
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)