From 46dba68dbab536e5afeb0ea6c87eb3f0245426f2 Mon Sep 17 00:00:00 2001 From: TekExplorer Date: Tue, 5 Jan 2021 19:39:42 +0000 Subject: [PATCH] Add multiple java images to minecraft eggs --- .../forge/curseforge-generic/egg-curseforge-generic.json | 4 ++++ minecraft/java/forge/forge/egg-forge-enhanced.json | 4 ++++ minecraft/java/ftb/egg-ftb-modpacksch-server.json | 4 ++++ minecraft/java/magma/egg-magma.json | 4 ++++ minecraft/java/mohist/egg-mohist.json | 4 ++++ minecraft/java/paper/egg-paper.json | 7 ++++++- minecraft/java/purpur/egg-purpur.json | 6 +++++- minecraft/java/spigot/egg-spigot.json | 6 +++++- minecraft/java/spongeforge/egg-sponge-forge.json | 4 ++++ minecraft/java/spongevanilla/egg-sponge-vanilla.json | 4 ++++ minecraft/java/vanillacord/egg-vanilla-cord.json | 4 ++++ minecraft/proxy/cross_platform/waterdog/egg-waterdog.json | 4 ++++ minecraft/proxy/java/travertine/egg-travertine.json | 7 +++++-- minecraft/proxy/java/waterfall/egg-waterfall.json | 6 +++++- stock-eggs/minecraft/egg-bungeecord.json | 4 ++++ stock-eggs/minecraft/egg-forge-minecraft.json | 4 ++++ stock-eggs/minecraft/egg-paper.json | 6 +++++- stock-eggs/minecraft/egg-vanilla-minecraft.json | 4 ++++ 18 files changed, 79 insertions(+), 7 deletions(-) diff --git a/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json index 3b3a14b6..0c6e7a89 100644 --- a/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json +++ b/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json @@ -9,6 +9,10 @@ "description": "A generic egg for a forge modpack", "features": null, "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server.jar", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/forge/forge/egg-forge-enhanced.json b/minecraft/java/forge/forge/egg-forge-enhanced.json index 36f4b2ea..f145f4e1 100644 --- a/minecraft/java/forge/forge/egg-forge-enhanced.json +++ b/minecraft/java/forge/forge/egg-forge-enhanced.json @@ -9,6 +9,10 @@ "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/ftb/egg-ftb-modpacksch-server.json b/minecraft/java/ftb/egg-ftb-modpacksch-server.json index ab911abb..48f6a86e 100644 --- a/minecraft/java/ftb/egg-ftb-modpacksch-server.json +++ b/minecraft/java/ftb/egg-ftb-modpacksch-server.json @@ -8,6 +8,10 @@ "author": "runemaster580@gmail.com", "description": "Since the release of the FTB APP, FTB modpacks are now distributed through modpacks.ch. This egg was developed for support for modpacks that are distributed through this.", "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar forge-server.jar", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/magma/egg-magma.json b/minecraft/java/magma/egg-magma.json index 52d31ba4..c77aebdf 100644 --- a/minecraft/java/magma/egg-magma.json +++ b/minecraft/java/magma/egg-magma.json @@ -8,6 +8,10 @@ "author": "support@pterodactyl.io", "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.", "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/mohist/egg-mohist.json b/minecraft/java/mohist/egg-mohist.json index 8b675b74..947a2693 100644 --- a/minecraft/java/mohist/egg-mohist.json +++ b/minecraft/java/mohist/egg-mohist.json @@ -9,6 +9,10 @@ "description": "Spigot fork with performance optimizations.", "features": null, "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} pause", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json index 63d37a01..99cbce89 100644 --- a/minecraft/java/paper/egg-paper.json +++ b/minecraft/java/paper/egg-paper.json @@ -8,7 +8,12 @@ "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", "features": ["eula"], - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java-11", + "quay.io\/pterodactyl\/core:java", + "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-15" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/purpur/egg-purpur.json b/minecraft/java/purpur/egg-purpur.json index 0e87c446..d34763ae 100644 --- a/minecraft/java/purpur/egg-purpur.json +++ b/minecraft/java/purpur/egg-purpur.json @@ -10,7 +10,11 @@ "features": [ "eula" ], - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java-11", + "quay.io\/pterodactyl\/core:java" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/spigot/egg-spigot.json b/minecraft/java/spigot/egg-spigot.json index f270f799..e59a33e0 100644 --- a/minecraft/java/spigot/egg-spigot.json +++ b/minecraft/java/spigot/egg-spigot.json @@ -8,7 +8,11 @@ "author": "support@pterodactyl.io", "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.", "features": ["eula"], - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java-11", + "quay.io\/pterodactyl\/core:java" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/spongeforge/egg-sponge-forge.json b/minecraft/java/spongeforge/egg-sponge-forge.json index 3ba615a1..8d921d24 100644 --- a/minecraft/java/spongeforge/egg-sponge-forge.json +++ b/minecraft/java/spongeforge/egg-sponge-forge.json @@ -9,6 +9,10 @@ "description": "A community-driven open source Minecraft: Java Edition modding platform.", "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/spongevanilla/egg-sponge-vanilla.json b/minecraft/java/spongevanilla/egg-sponge-vanilla.json index 8e1995bc..349674e5 100644 --- a/minecraft/java/spongevanilla/egg-sponge-vanilla.json +++ b/minecraft/java/spongevanilla/egg-sponge-vanilla.json @@ -9,6 +9,10 @@ "description": "SpongeVanilla is the implementation of the Sponge API on top of Vanilla Minecraft.", "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/java/vanillacord/egg-vanilla-cord.json b/minecraft/java/vanillacord/egg-vanilla-cord.json index 83acf714..881a00dc 100644 --- a/minecraft/java/vanillacord/egg-vanilla-cord.json +++ b/minecraft/java/vanillacord/egg-vanilla-cord.json @@ -9,6 +9,10 @@ "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.\r\n\r\nVanillaCord adds support for BungeeCord's ip_forward setting.", "features": ["eula"], "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json index a2940430..82d35d4e 100644 --- a/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json +++ b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json @@ -9,6 +9,10 @@ "description": "Waterdog is fork of the well-known Waterfall, which is a fork of the well-known BungeeCord, server teleportation suite.", "features": null, "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{}", diff --git a/minecraft/proxy/java/travertine/egg-travertine.json b/minecraft/proxy/java/travertine/egg-travertine.json index ce4eb137..9c4c3ef9 100644 --- a/minecraft/proxy/java/travertine/egg-travertine.json +++ b/minecraft/proxy/java/travertine/egg-travertine.json @@ -8,7 +8,10 @@ "author": "parker@parkervcp.com", "description": "Travertine is a fork of Waterfall with 1.7 protocol support. Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"127.0.0.1\": \"{{config.docker.interface}}\",\r\n \"localhost\": \"{{config.docker.interface}}\"\r\n }\r\n }\r\n }\r\n}", @@ -61,4 +64,4 @@ "rules": "required|string|max:20" } ] -} \ No newline at end of file +} diff --git a/minecraft/proxy/java/waterfall/egg-waterfall.json b/minecraft/proxy/java/waterfall/egg-waterfall.json index 4698ae4d..a80841ba 100644 --- a/minecraft/proxy/java/waterfall/egg-waterfall.json +++ b/minecraft/proxy/java/waterfall/egg-waterfall.json @@ -8,7 +8,11 @@ "author": "hostmaster@waterfallgaming.net", "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.", "features": null, - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java-11", + "quay.io\/pterodactyl\/core:java" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"127.0.0.1\": \"{{config.docker.interface}}\",\r\n \"localhost\": \"{{config.docker.interface}}\"\r\n }\r\n }\r\n }\r\n}", diff --git a/stock-eggs/minecraft/egg-bungeecord.json b/stock-eggs/minecraft/egg-bungeecord.json index 7c34dece..e53ed759 100644 --- a/stock-eggs/minecraft/egg-bungeecord.json +++ b/stock-eggs/minecraft/egg-bungeecord.json @@ -8,6 +8,10 @@ "author": "support@pterodactyl.io", "description": "For a long time, Minecraft server owners have had a dream that encompasses a free, easy, and reliable way to connect multiple Minecraft servers together. BungeeCord is the answer to said dream. Whether you are a small server wishing to string multiple game-modes together, or the owner of the ShotBow Network, BungeeCord is the ideal solution for you. With the help of BungeeCord, you will be able to unlock your community's full potential.", "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"yaml\",\r\n \"find\": {\r\n \"listeners[0].query_enabled\": true,\r\n \"listeners[0].query_port\": \"{{server.build.default.port}}\",\r\n \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n \"servers.*.address\": {\r\n \"regex:^(127\\\\.0\\\\.0\\\\.1|localhost)(:\\\\d{1,5})?$\": \"{{config.docker.interface}}$2\"\r\n }\r\n }\r\n }\r\n}", diff --git a/stock-eggs/minecraft/egg-forge-minecraft.json b/stock-eggs/minecraft/egg-forge-minecraft.json index 6f404d1c..f547310d 100644 --- a/stock-eggs/minecraft/egg-forge-minecraft.json +++ b/stock-eggs/minecraft/egg-forge-minecraft.json @@ -8,6 +8,10 @@ "author": "support@pterodactyl.io", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\",\r\n \"query.port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/stock-eggs/minecraft/egg-paper.json b/stock-eggs/minecraft/egg-paper.json index e402cb50..7278a7f5 100644 --- a/stock-eggs/minecraft/egg-paper.json +++ b/stock-eggs/minecraft/egg-paper.json @@ -7,7 +7,11 @@ "name": "Paper", "author": "parker@pterodactyl.io", "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.", - "image": "quay.io\/pterodactyl\/core:java", + "image": "quay.io\/pterodactyl\/core:java-11", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}", diff --git a/stock-eggs/minecraft/egg-vanilla-minecraft.json b/stock-eggs/minecraft/egg-vanilla-minecraft.json index fadd91a4..df90f74a 100644 --- a/stock-eggs/minecraft/egg-vanilla-minecraft.json +++ b/stock-eggs/minecraft/egg-vanilla-minecraft.json @@ -8,6 +8,10 @@ "author": "support@pterodactyl.io", "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.", "image": "quay.io\/pterodactyl\/core:java", + "images": [ + "quay.io\/pterodactyl\/core:java", + "quay.io\/pterodactyl\/core:java-11" + ], "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}", "config": { "files": "{\r\n \"server.properties\": {\r\n \"parser\": \"properties\",\r\n \"find\": {\r\n \"server-ip\": \"0.0.0.0\",\r\n \"enable-query\": \"true\",\r\n \"server-port\": \"{{server.build.default.port}}\"\r\n }\r\n }\r\n}",