From 0644b0e00ac2e489eafadbe8745bb57b9cfb3a0c Mon Sep 17 00:00:00 2001 From: Holly Cummins Date: Sun, 11 Aug 2024 21:54:47 +0100 Subject: [PATCH] Enable container re-use, so tests pass --- .../minecrafter/deployment/MinecraftContainer.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/extension/deployment/src/main/java/org/acme/minecrafter/deployment/MinecraftContainer.java b/extension/deployment/src/main/java/org/acme/minecrafter/deployment/MinecraftContainer.java index 8355106..b8a6835 100644 --- a/extension/deployment/src/main/java/org/acme/minecrafter/deployment/MinecraftContainer.java +++ b/extension/deployment/src/main/java/org/acme/minecrafter/deployment/MinecraftContainer.java @@ -1,7 +1,6 @@ package org.acme.minecrafter.deployment; import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.Network; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.utility.DockerImageName; @@ -14,13 +13,6 @@ public class MinecraftContainer extends GenericContainer { public MinecraftContainer(DockerImageName image) { super(image); - - List portBindings = new ArrayList<>(); - portBindings.add("25565:25565"); // Make life easy for the minecraft client - setPortBindings(portBindings); - //withReuse(true); - - // withExposedPorts(MINECRAFT_PORT); // This is a bit of a cheat, since at this point the client isn't ready, but otherwise it's too slow waitingFor(Wait.forLogMessage(".*" + "Preparing" + ".*", 1)); } @@ -28,7 +20,11 @@ public MinecraftContainer(DockerImageName image) { @Override protected void configure() { - withNetwork(Network.SHARED); + List portBindings = new ArrayList<>(); + portBindings.add("25565:25565"); // Make life easy for the minecraft client + setPortBindings(portBindings); + + withReuse(true); addExposedPorts(OBSERVABILITY_PORT); addExposedPorts(MINECRAFT_PORT); }