Run all Team Servers in their own docker container

.dockerignore

@@ -0,0 +1,4 @@
+.gradle
+**/build
+.git
+.idea

Dockerfile

@@ -1,5 +1,5 @@
 # This dockerfile is far from best practice and is a pure "Make it work" approach. Please do not use it as a reference of any kind.
-FROM gradle:jdk21-alpine as build
+FROM gradle:jdk25-alpine as build
 
 COPY . .
 RUN gradle clean :bot:build :plugin-paper:build --no-daemon

bot/build.gradle.kts

@@ -20,16 +20,26 @@ dependencies {
     implementation("de.chojo", "cjda-util", "2.14.5+jda-6.3.0") {
         exclude(module = "opus-java")
     }
+
+    implementation("net.dv8tion", "JDA", "6.4.1")
+
     implementation(libs.javalin.bundle)
     implementation(libs.javalin.openapi)
     implementation(libs.javalin.swagger)
     annotationProcessor(libs.javalin.annotation)
     implementation("net.lingala.zip4j", "zip4j", "2.11.6")
 
+    // config
+    implementation("dev.chojo", "ocular", "2.2.1")
+    implementation("tools.jackson.dataformat:jackson-dataformat-yaml:3.1.4")
+
     // database
     implementation(libs.bundles.sadu)
     implementation("org.postgresql", "postgresql", "42.7.11")
 
+    // docker api
+    implementation(libs.bundles.docker)
+
     // Logging
     implementation(libs.bundles.logging)
     implementation("club.minnced", "discord-webhooks", "0.8.4")

bot/src/main/java/de/chojo/gamejam/Bot.java

@@ -155,6 +155,7 @@ private void buildLocale() {
                 .addLanguage(DiscordLocale.GERMAN)
                 .withLanguageProvider(guild -> Optional.ofNullable(guilds.guild(guild).settings().locale())
                         .map(DiscordLocale::from))
+                .withGuildLocaleCodeProvider((guild, s) -> Optional.empty())
                 .build();
     }
 

bot/src/main/java/de/chojo/gamejam/api/v1/Server.java

@@ -107,9 +107,9 @@ private void handle(@NotNull Context ctx) {
 
         ctx.status(HttpStatus.ACCEPTED);
         String restart = ctx.queryParam("restart");
-        if ("true".equals(restart) && teamServer.running()) {
+        if ("true".equals(restart) && teamServer.isRunning()) {
             teamServer.restart();
-        } else if (teamServer.running()) {
+        } else if (teamServer.isRunning()) {
             teamServer.send("say Plugin Updated");
         }
     }

bot/src/main/java/de/chojo/gamejam/commands/server/configure/MaxPlayers.java

@@ -7,7 +7,6 @@
 package de.chojo.gamejam.commands.server.configure;
 
 import de.chojo.gamejam.commands.server.Server;
-import de.chojo.gamejam.server.TeamServer;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.util.Futures;
 import de.chojo.jdautil.wrapper.EventContext;
@@ -37,7 +36,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
                                 .POST(HttpRequest.BodyPublishers.ofString(String.valueOf(event.getOption("amount").getAsInt())))
                                 .build();
 
-        if (!teamServer.running()) {
+        if (!teamServer.isRunning()) {
             event.reply(context.localize("error.servernotrunning")).queue();
             return;
         }

bot/src/main/java/de/chojo/gamejam/commands/server/configure/Message.java

@@ -37,7 +37,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
 
         var teamServer = optServer.get();
 
-        if (!teamServer.running()) {
+        if (!teamServer.isRunning()) {
             event.reply(context.localize("error.servernotrunning")).queue();
             return;
         }

bot/src/main/java/de/chojo/gamejam/commands/server/configure/SpectatorOverflow.java

@@ -7,7 +7,6 @@
 package de.chojo.gamejam.commands.server.configure;
 
 import de.chojo.gamejam.commands.server.Server;
-import de.chojo.gamejam.server.TeamServer;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.util.Futures;
 import de.chojo.jdautil.wrapper.EventContext;
@@ -34,7 +33,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
 
         var teamServer = optServer.get();
 
-        if (!teamServer.running()) {
+        if (!teamServer.isRunning()) {
             event.reply(context.localize("error.servernotrunning")).queue();
             return;
         }

bot/src/main/java/de/chojo/gamejam/commands/server/configure/Whitelist.java

@@ -7,7 +7,6 @@
 package de.chojo.gamejam.commands.server.configure;
 
 import de.chojo.gamejam.commands.server.Server;
-import de.chojo.gamejam.server.TeamServer;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.util.Futures;
 import de.chojo.jdautil.wrapper.EventContext;
@@ -34,7 +33,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
 
         var teamServer = optServer.get();
 
-        if (!teamServer.running()) {
+        if (!teamServer.isRunning()) {
             event.reply(context.localize("error.servernotrunning")).queue();
             return;
         }

bot/src/main/java/de/chojo/gamejam/commands/server/process/Log.java

@@ -12,7 +12,10 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.utils.FileUpload;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
 public class Log implements SlashHandler {
@@ -27,16 +30,13 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         var optServer = server.getServer(event, context);
         if(optServer.isEmpty())return;
         var teamServer = optServer.get();
-        var logFile = teamServer.logFile();
-        String content;
-        try {
-            content = Files.readString(logFile);
-        } catch (IOException e) {
-            content = "";
+        var logs = teamServer.logs(0);
+        var content = logs.substring(Math.max(logs.length() - 1950, 0));
+        try(InputStream inputStream = new ByteArrayInputStream(logs.getBytes(StandardCharsets.UTF_8))) {
+            event.reply("```log%n%s%n```".formatted(content))
+                    .addFiles(FileUpload.fromData(inputStream, "latest.log"))
+                    .queue();
+        } catch (IOException _) {
         }
-        content = content.substring(Math.max(content.length() - 1950, 0));
-        event.reply("```log%n%s%n```".formatted(content))
-             .addFiles(FileUpload.fromData(logFile, "latest.log"))
-             .queue();
     }
 }

bot/src/main/java/de/chojo/gamejam/commands/server/process/Restart.java

@@ -24,8 +24,8 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         if(optServer.isEmpty())return;
         var teamServer = optServer.get();
         if (teamServer.exists()) {
-            teamServer.stop(true)
-                      .thenRun(() -> event.getHook().editOriginal(context.localize("command.server.process.restart.message.restarted")).queue());
+            teamServer.stop();
+            event.getHook().editOriginal(context.localize("command.server.process.restart.message.restarted")).queue();
             event.reply(context.localize("command.server.process.restart.message.restarting")).queue();
         }
     }

bot/src/main/java/de/chojo/gamejam/commands/server/process/Stop.java

@@ -25,7 +25,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         var teamServer = optServer.get();
         if (teamServer.exists()) {
             event.reply(context.localize("command.server.process.stop.message.stopping")).queue();
-            teamServer.stop(false).thenRun(() -> event.getHook().editOriginal(
+            teamServer.stop().thenRun(() -> event.getHook().editOriginal(
                     context.localize("command.server.process.stop.message.stopped")).queue());
         }
     }

bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/restart/RestartAll.java

@@ -34,9 +34,9 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         var count = jam.teams().teams().stream()
                        .map(serverService::get)
                        .filter(server -> {
-                           var running = server.running();
+                           var running = server.isRunning();
                            if (running) {
-                               server.stop(true);
+                               server.stop();
                            }
                            return running;
                        })

bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/restart/RestartTeam.java

@@ -42,7 +42,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         }
 
         var started = optTeam.map(serverService::get).map(server -> {
-            var running = server.running();
+            var running = server.isRunning();
             server.restart();
             return running;
         }).orElse(false);

bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/stop/StopAll.java

@@ -34,8 +34,8 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         var count = jam.teams().teams().stream()
                        .map(serverService::get)
                        .map(server -> {
-                           var running = server.running();
-                           server.stop(false);
+                           var running = server.isRunning();
+                           server.stop();
                            return running;
                        })
                        .filter(v -> v)

bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/stop/StopTeam.java

@@ -42,7 +42,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         }
 
         var started = optTeam.map(serverService::get).map(server -> {
-            var running = server.running();
+            var running = server.isRunning();
             server.stop();
             return running;
         }).orElse(false);

bot/src/main/java/de/chojo/gamejam/configuration/ConfigFile.java

@@ -6,20 +6,22 @@
 
 package de.chojo.gamejam.configuration;
 
-import de.chojo.gamejam.configuration.elements.Api;
-import de.chojo.gamejam.configuration.elements.BaseSettings;
-import de.chojo.gamejam.configuration.elements.Database;
-import de.chojo.gamejam.configuration.elements.Plugins;
-import de.chojo.gamejam.configuration.elements.ServerManagement;
-import de.chojo.gamejam.configuration.elements.ServerTemplate;
+import de.chojo.gamejam.configuration.elements.*;
 
 @SuppressWarnings("FieldMayBeFinal")
 public class ConfigFile {
     private BaseSettings baseSettings = new BaseSettings();
     private Database database = new Database();
     private Api api = new Api();
     private ServerManagement serverManagement = new ServerManagement();
+
+    private Docker docker = new Docker();
     private Plugins plugins = new Plugins();
+
+    public void setServerTemplate(ServerTemplate serverTemplate) {
+        this.serverTemplate = serverTemplate;
+    }
+
     private ServerTemplate serverTemplate = new ServerTemplate();
 
     public BaseSettings baseSettings() {
@@ -38,6 +40,10 @@ public ServerManagement serverManagement(){
         return serverManagement;
     }
 
+    public Docker docker() {
+        return docker;
+    }
+
     public Plugins plugins() {
         return plugins;
     }

bot/src/main/java/de/chojo/gamejam/configuration/Configuration.java

@@ -6,17 +6,19 @@
 
 package de.chojo.gamejam.configuration;
 
-import de.chojo.gamejam.configuration.elements.Api;
-import de.chojo.gamejam.configuration.elements.BaseSettings;
-import de.chojo.gamejam.configuration.elements.Database;
-import de.chojo.gamejam.configuration.elements.Plugins;
-import de.chojo.gamejam.configuration.elements.ServerManagement;
-import de.chojo.gamejam.configuration.elements.ServerTemplate;
-import de.chojo.jdautil.configuration.BaseConfiguration;
-
-public class Configuration extends BaseConfiguration<ConfigFile> {
+import de.chojo.gamejam.configuration.elements.*;
+import dev.chojo.ocular.Configurations;
+import dev.chojo.ocular.dataformats.YamlDataFormat;
+import dev.chojo.ocular.key.Key;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class Configuration extends Configurations<ConfigFile> {
+    public static final Key<ConfigFile> MAIN = Key.builder(Path.of("config.yml"), ConfigFile::new).build();
+
     private Configuration() {
-        super(new ConfigFile());
+        super(Path.of("config"), MAIN, List.of(new YamlDataFormat()), Configuration.class.getClassLoader(), null);
     }
 
     public static Configuration create() {
@@ -27,26 +29,30 @@ public static Configuration create() {
 
 
     public Database database() {
-        return config().database();
+        return main().database();
+    }
+
+    public Docker docker() {
+        return main().docker();
     }
 
     public BaseSettings baseSettings() {
-        return config().baseSettings();
+        return main().baseSettings();
     }
 
     public Api api() {
-        return config().api();
+        return main().api();
     }
 
     public ServerManagement serverManagement() {
-        return config().serverManagement();
+        return main().serverManagement();
     }
 
     public Plugins plugins() {
-        return config().plugins();
+        return main().plugins();
     }
 
     public ServerTemplate serverTemplate() {
-        return config().serverTemplate();
+        return main().serverTemplate();
     }
 }

bot/src/main/java/de/chojo/gamejam/configuration/elements/Docker.java

@@ -0,0 +1,52 @@
+/*
+ *     SPDX-License-Identifier: AGPL-3.0-only
+ *
+ *     Copyright (C) 2022 DevCord Team and Contributor
+ */
+
+package de.chojo.gamejam.configuration.elements;
+
+@SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})
+public class Docker {
+    private String host = "unix:///var/run/docker.sock";
+    private String certPath = "/home/user/.docker";
+    private boolean tlsVerify = true;
+    private String registryUsername;
+    private String registryPassword;
+    private String registryEmail;
+    private String registryUrl;
+    private String networkName = "plugin-jam-network";
+
+    public String getHost() {
+        return host;
+    }
+
+    public String getCertPath() {
+        return certPath;
+    }
+
+    public boolean isTlsVerify() {
+        return tlsVerify;
+    }
+
+    public String getRegistryUsername() {
+        return registryUsername;
+    }
+
+    public String getRegistryPassword() {
+        return registryPassword;
+    }
+
+    public String getRegistryEmail() {
+        return registryEmail;
+    }
+
+    public String getRegistryUrl() {
+        return registryUrl;
+    }
+
+    public String getNetworkName() {
+        return networkName;
+    }
+
+}

bot/src/main/java/de/chojo/gamejam/configuration/elements/Plugins.java

@@ -16,11 +16,16 @@
 @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})
 public class Plugins {
     private String pluginDir = "plugins";
+    private List<String> defaultPlugins = List.of();
 
     public String pluginDir() {
         return pluginDir;
     }
 
+    public List<String> defaultPlugins() {
+        return defaultPlugins;
+    }
+
     private Path pluginPath() {
         return Path.of(pluginDir);
     }