Adjust a couple of things for docker hosting

.gitignore

@@ -44,3 +44,4 @@ buildNumber.properties
 /wait.sh
 /conf/
 .direnv
+data

Dockerfile

@@ -0,0 +1,26 @@
+# 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
+
+COPY . .
+RUN gradle clean build --no-daemon
+
+# We use a jammy image because we need some more stuff than alpine provides
+FROM eclipse-temurin:21-jammy as runtime
+
+WORKDIR /app
+RUN apt update
+# Make sure screen exists.
+RUN apt install -y screen
+
+# Setting up the bot
+COPY --from=build /home/gradle/bot/build/libs/bot-*-all.jar ./bot.jar
+RUN mkdir plugins
+RUN mkdir servers
+RUN mkdir template
+RUN mkdir template/plugins
+COPY docker/resources/bot/wait.sh .
+# Copy the plugin jam plugin into the template.
+COPY --from=build /home/gradle/plugin-paper/build/libs/plugin-paper-*-all.jar ./bot/template/plugins/pluginjam.jar
+
+COPY docker/resources/docker-entrypoint.sh .
+ENTRYPOINT ["bash", "docker-entrypoint.sh"]

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

@@ -14,7 +14,8 @@ public class ServerManagement {
     private String serverDir= "server";
     private int minPort = 30001;
     private int maxPort = 30500;
-    private int velocityApi = 30000;
+    private String velocityHost = "velocity";
+    private int velocityPort = 30000;
     private int maxPlayers = 50;
     private int memory = 1024;
 
@@ -28,8 +29,8 @@ public int maxPort() {
         return maxPort;
     }
 
-    public int velocityApi() {
-        return velocityApi;
+    public int velocityPort() {
+        return velocityPort;
     }
 
     public List<String> parameter() {
@@ -47,4 +48,8 @@ public int memory() {
     public String serverDir() {
         return serverDir;
     }
+
+    public String getVelocityHost() {
+        return velocityHost;
+    }
 }

bot/src/main/java/de/chojo/gamejam/server/ServerService.java

@@ -71,16 +71,17 @@ public void syncVelocity() {
         freePorts.clear();
         IntStream.rangeClosed(configuration.serverManagement().minPort(), configuration.serverManagement().maxPort())
                  .forEach(freePorts::add);
-        var velocityApi = configuration.serverManagement().velocityApi();
+        var velocityPort = configuration.serverManagement().velocityPort();
+        var velocityHost = configuration.serverManagement().getVelocityHost();
         var httpClient = HttpClient.newHttpClient();
-        var req = HttpRequest.newBuilder(URI.create("http://localhost:%d/v1/server".formatted(velocityApi)))
+        var req = HttpRequest.newBuilder(URI.create("http://%s:%d/v1/server".formatted(velocityHost, velocityPort)))
                              .GET()
                              .build();
         HttpResponse<String> response;
         try {
             response = httpClient.send(req, HttpResponse.BodyHandlers.ofString());
         } catch (IOException e) {
-            log.error("Could not reach velocity inteance", e);
+            log.error("Could not reach velocity instance", e);
             return;
         } catch (InterruptedException e) {
             log.error("Interrupted", e);

bot/src/main/java/de/chojo/gamejam/server/TeamServer.java

@@ -174,7 +174,8 @@ public boolean start() {
         command.add("-Xms%dM".formatted(server.memory()));
         command.addAll(AIKAR);
         command.addAll(server.parameter());
-        command.add("-Dpluginjam.port=" + server.velocityApi());
+        command.add("-Dpluginjam.port=" + server.velocityPort());
+        command.add("-Dpluginjam.host=" + server.getVelocityHost());
         command.add("-Dpluginjam.team.id=" + team.id());
         command.add("-Dpluginjam.team.name=" + teamName());
         command.add("-Djavalin.port=" + apiPort);

compose.yml

@@ -0,0 +1,28 @@
+services:
+  bot:
+    image: ghcr.io/devcordde/plugin-jam-bot:latest
+    volumes:
+      - ./data/bot/config:/app/config
+      - ./data/bot/plugins:/app/plugins
+      - ./data/bot/servers:/app/servers
+      - ./data/bot/template:/app/template
+  velocity:
+    image: itzg/mc-proxy:latest
+    tty: true
+    environment:
+      EULA: "TRUE"
+      TYPE: VELOCITY
+      JVM_DD_OPTS: javalin.port=30000
+    volumes:
+      - ./data/velocity/config:/config
+      - ./data/velocity/plugins:/plugins
+  lobby:
+    image: itzg/minecraft-server:latest
+    stdin_open: true
+    tty: true
+    environment:
+      VERSION: 1.21
+      TYPE: PAPER
+      MEMORY: 2G
+    volumes:
+      - ./data/lobby:/data

dev.compose.yml

@@ -0,0 +1,32 @@
+services:
+  bot:
+    build: .
+    volumes:
+      - ./data/bot/config:/app/config
+      - ./data/bot/plugins:/app/plugins
+      - ./data/bot/servers:/app/servers
+      - ./data/bot/template:/app/template
+  database:
+    image: postgres:16
+    environment:
+      POSTGRES_PASSWORD: postgres
+  velocity:
+    image: itzg/mc-proxy:latest
+    tty: true
+    environment:
+      EULA: "TRUE"
+      TYPE: VELOCITY
+      JVM_DD_OPTS: javalin.port=30000
+    volumes:
+      - ./data/velocity/config:/config
+      - ./data/velocity/plugins:/plugins
+  lobby:
+    image: itzg/minecraft-server:latest
+    stdin_open: true
+    tty: true
+    environment:
+      VERSION: 1.21
+      TYPE: PAPER
+      MEMORY: 2G
+    volumes:
+      - ./data/lobby:/data

docker/resources/bot/loop.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+
+# switch to config directory
+
+while true; do
+# Of course you can use any other executable file here. We use java.
+  java \
+      -Xms256m \
+      -Xmx2048m \
+      -Dbot.config=config/config.json -Dlog4j.configurationFile=config/log4j2.xml -Dcjda.localisation.error.name=false -Dcjda.interactions.cleanguildcommands=true  \
+      -jar ./bot.jar
+
+  code=$?
+
+  case $code in
+    0) # proper shutdown
+      echo "Performed proper shutdown, exiting restart loop"
+      exit 0
+    ;;
+    10) # restart request
+      echo "Requested to restart"
+      continue
+    ;;
+    *) # Recovering
+      echo "Unknown exit code, attempting recovery restart in a few seconds"
+      sleep 2
+      continue
+    ;;
+  esac
+done

docker/resources/bot/start.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+java -Xms256m -Xmx2048m -Dbot.config=config/config.json -Dlog4j.configurationFile=config/log4j2.xml -Dcjda.localisation.error.name=false -Dcjda.interactions.cleanguildcommands=true -jar ./bot.jar

docker/resources/bot/wait.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+while screen -ls | grep -q "$1"
+  do
+    sleep 1
+    echo "wait"
+  done
+sleep 1

docker/resources/docker-entrypoint.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+java -Xms256m -Xmx2048m -Dbot.config=config/config.json -Dlog4j.configurationFile=config/log4j2.xml -Dcjda.localisation.error.name=false -Dcjda.interactions.cleanguildcommands=true -jar ./bot.jar

docker/resources/lobby/start.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+screen -dmS lobby java -Xms1G -Xmx1G -Dcom.mojang.eula.agree=true -jar server.jar --nogui

docker/resources/velocity/start.sh

@@ -0,0 +1 @@
+screen -dmS velocity java -Djavalin.port="29999" -jar velocity.jar

plugin-paper/build.gradle.kts

@@ -20,7 +20,6 @@ tasks {
         val shadebase = "de.chojo.pluginjam."
         relocate("de.eldoria.eldoutilities", shadebase + "eldoutilities")
         mergeServiceFiles()
-        archiveFileName.set("pluginjam.jar")
     }
 
     register<Copy>("copyToServer") {

plugin-paper/src/main/java/de/chojo/pluginjam/velocity/ReportService.java

@@ -27,14 +27,16 @@ public class ReportService implements Runnable {
     private final int id;
     private final Gson gson = new Gson();
     private final String name;
-    private final int velocityApi;
+    private final int velocityPort;
     private final int apiPort;
+    private final String velocityHost;
 
     private ReportService(Plugin plugin) {
         this.plugin = plugin;
         id = Integer.parseInt(System.getProperty("pluginjam.team.id"));
         name = System.getProperty("pluginjam.team.name");
-        velocityApi = Integer.parseInt(System.getProperty("pluginjam.port"));
+        velocityPort = Integer.parseInt(System.getProperty("pluginjam.port"));
+        velocityHost = System.getProperty("pluginjam.host");
         apiPort = Integer.parseInt(System.getProperty("javalin.port", "30000"));
     }
 
@@ -103,10 +105,10 @@ public void shutdown() {
     }
 
     private URI apiUrl(String... path) {
-        return URI.create("http://localhost:%d/%s".formatted(velocityApi, String.join("/", path)));
+        return URI.create("http://%s:%d/%s".formatted(velocityHost,velocityPort, String.join("/", path)));
     }
 
     private URI queryApiUrl(String query, String... path) {
-        return URI.create("http://localhost:%d/%s?%s".formatted(velocityApi, String.join("/", path), query));
+        return URI.create("http://%s:%d/%s?%s".formatted(velocityHost, velocityPort, String.join("/", path), query));
     }
 }

plugin-velocity/build.gradle.kts

@@ -21,7 +21,10 @@ tasks {
         //relocate("io.javalin", "$shadebase.javalin")
         //relocate("org.eclipse", shadebase)
         mergeServiceFiles()
-        archiveFileName.set("PluginJam.jar")
+    }
+
+    build{
+        dependsOn(shadowJar)
     }
 
     register<Copy>("copyToServer") {