Update seeder and migrations to use new docker images.

DaneEveritt · DaneEveritt · commit 9a803e61ec88 · 2017-03-18T14:49:48.000-04:00
diff --git a/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php b/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php
@@ -16,14 +16,26 @@ public function up()
     {
         DB::transaction(function () {
             // Attempt to fix any startup commands for servers
-            // that we possibly can.
+            // that we possibly can. Also set new containers.
             foreach (ServiceOption::with('servers')->get() as $option) {
                 $option->servers->each(function ($s) use ($option) {
                     $prepend = $option->display_executable;
                     $prepend = ($prepend === './ShooterGameServer') ? './ShooterGame/Binaries/Linux/ShooterGameServer' : $prepend;
                     $prepend = ($prepend === 'TerrariaServer.exe') ? 'mono TerrariaServer.exe' : $prepend;
 
                     $s->startup = $prepend . ' ' . $s->startup;
+
+                    $container = $s->container;
+                    if (starts_with($container, 'quay.io/pterodactyl/minecraft')) {
+                        $s->container = 'quay.io/pterodactyl/core:java';
+                    } elseif (starts_with($container, 'quay.io/pterodactyl/srcds')) {
+                        $s->container = 'quay.io/pterodactyl/core:source';
+                    } elseif (starts_with($container, 'quay.io/pterodactyl/voice')) {
+                        $s->container = 'quay.io/pterodactyl/core:glibc';
+                    } elseif (starts_with($container, 'quay.io/pterodactyl/terraria')) {
+                        $s->container = 'quay.io/pterodactyl/core:mono'
+                    }
+
                     $s->save();
                 });
             }
diff --git a/database/seeds/MinecraftServiceTableSeeder.php b/database/seeds/MinecraftServiceTableSeeder.php
@@ -116,7 +116,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Vanilla Minecraft',
             '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.',
-            'docker_image' => 'quay.io/pterodactyl/minecraft',
+            'docker_image' => 'quay.io/pterodactyl/core:java',
             'config_startup' => '{"done": ")! For help, type ", "userInteraction": [ "Go to eula.txt for more info."]}',
             'config_logs' => '{"custom": false, "location": "logs/latest.log"}',
             'config_files' => '{"server.properties":{"parser": "properties", "find":{"server-ip": "0.0.0.0", "enable-query": "true", "server-port": "{{server.build.default.port}}", "query.port": "{{server.build.default.port}}"}}}',
@@ -131,7 +131,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Spigot',
             '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.',
-            'docker_image' => 'quay.io/pterodactyl/minecraft:spigot',
+            'docker_image' => 'quay.io/pterodactyl/core:java',
             'config_startup' => null,
             'config_files' => '{"spigot.yml":{"parser": "yaml", "find":{"settings.restart-on-crash": "false"}}}',
             'config_logs' => null,
@@ -146,7 +146,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Sponge (SpongeVanilla)',
             'description' => 'SpongeVanilla is the SpongeAPI implementation for Vanilla Minecraft.',
-            'docker_image' => 'quay.io/pterodactyl/minecraft:sponge',
+            'docker_image' => 'quay.io/pterodactyl/core:java',
             'config_startup' => '{"userInteraction": [ "You need to agree to the EULA"]}',
             'config_files' => null,
             'config_logs' => null,
@@ -161,7 +161,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Bungeecord',
             '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.',
-            'docker_image' => 'quay.io/pterodactyl/minecraft:bungeecord',
+            'docker_image' => 'quay.io/pterodactyl/core:java',
             'config_startup' => '{"done": "Listening on ", "userInteraction": [ "Listening on /0.0.0.0:25577"]}',
             'config_files' => '{"config.yml":{"parser": "yaml", "find":{"listeners[0].query_enabled": true, "listeners[0].query_port": "{{server.build.default.port}}", "listeners[0].host": "0.0.0.0:{{server.build.default.port}}", "servers.*.address":{"127.0.0.1": "{{config.docker.interface}}", "localhost": "{{config.docker.interface}}"}}}}',
             'config_logs' => '{"custom": false, "location": "proxy.log.0"}',
diff --git a/database/seeds/SourceServiceTableSeeder.php b/database/seeds/SourceServiceTableSeeder.php
@@ -75,7 +75,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Custom Source Engine Game',
             'description' => 'This option allows modifying the startup arguments and other details to run a custo SRCDS based game on the panel.',
-            'docker_image' => 'quay.io/pterodactyl/srcds',
+            'docker_image' => 'quay.io/pterodacty/core:source',
             'config_startup' => '{"done": "gameserver Steam ID", "userInteraction": []}',
             'config_files' => '{}',
             'config_logs' => '{"custom": true, "location": "logs/latest.log"}',
@@ -90,7 +90,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Insurgency',
             'description' => 'Take to the streets for intense close quarters combat, where a team\'s survival depends upon securing crucial strongholds and destroying enemy supply in this multiplayer and cooperative Source Engine based experience.',
-            'docker_image' => 'quay.io/pterodactyl/srcds',
+            'docker_image' => 'quay.io/pterodacty/core:source',
             'config_startup' => null,
             'config_files' => null,
             'config_logs' => null,
@@ -105,7 +105,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Team Fortress 2',
             'description' => 'Team Fortress 2 is a team-based first-person shooter multiplayer video game developed and published by Valve Corporation. It is the sequel to the 1996 mod Team Fortress for Quake and its 1999 remake.',
-            'docker_image' => 'quay.io/pterodactyl/srcds',
+            'docker_image' => 'quay.io/pterodacty/core:source',
             'config_startup' => null,
             'config_files' => null,
             'config_logs' => null,
@@ -120,7 +120,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Ark: Survival Evolved',
             'description' => 'As a man or woman stranded, naked, freezing, and starving on the unforgiving shores of a mysterious island called ARK, use your skill and cunning to kill or tame and ride the plethora of leviathan dinosaurs and other primeval creatures roaming the land. Hunt, harvest resources, craft items, grow crops, research technologies, and build shelters to withstand the elements and store valuables, all while teaming up with (or preying upon) hundreds of other players to survive, dominate... and escape! — Gamepedia: ARK',
-            'docker_image' => 'quay.io/pterodactyl/srcds:ark',
+            'docker_image' => 'quay.io/pterodacty/core:source',
             'config_startup' => '{"done": "Setting breakpad minidump AppID"}',
             'config_files' => null,
             'config_logs' => null,
diff --git a/database/seeds/TerrariaServiceTableSeeder.php b/database/seeds/TerrariaServiceTableSeeder.php
@@ -74,7 +74,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Terraria Server (TShock)',
             'description' => 'TShock is a server modification for Terraria, written in C#, and based upon the Terraria Server API. It uses JSON for configuration management, and offers several features not present in the Terraria Server normally.',
-            'docker_image' => 'quay.io/pterodactyl/terraria:tshock',
+            'docker_image' => 'quay.io/pterodactyl/core:mono',
             'config_startup' => '{"userInteraction": [ "You need to agree to the EULA"]}',
             'config_startup' => '{"done": "Type \'help\' for a list of commands", "userInteraction": []}',
             'config_files' => '{"tshock/config.json":{"parser": "json", "find":{"ServerPort": "{{server.build.default.port}}", "MaxSlots": "{{server.build.env.MAX_SLOTS}}"}}}',
diff --git a/database/seeds/VoiceServiceTableSeeder.php b/database/seeds/VoiceServiceTableSeeder.php
@@ -74,7 +74,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Mumble Server',
             'description' => 'Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.',
-            'docker_image' => 'quay.io/pterodactyl/voice:mumble',
+            'docker_image' => 'quay.io/pterodactyl/core:glibc',
             'config_startup' => '{"done": "Server listening on", "userInteraction": [ "Generating new server certificate"]}',
             'config_files' => '{"murmur.ini":{"parser": "ini", "find":{"logfile": "murmur.log", "port": "{{server.build.default.port}}", "host": "0.0.0.0", "users": "{{server.build.env.MAX_USERS}}"}}}',
             'config_logs' => '{"custom": true, "location": "logs/murmur.log"}',
@@ -89,7 +89,7 @@ private function addCoreOptions()
         ], [
             'name' => 'Teamspeak3 Server',
             'description' => 'VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.',
-            'docker_image' => 'quay.io/pterodactyl/voice:ts3',
+            'docker_image' => 'quay.io/pterodactyl/core:glibc',
             'config_startup' => '{"done": "listening on 0.0.0.0:", "userInteraction": []}',
             'config_files' => '{"ts3server.ini":{"parser": "ini", "find":{"default_voice_port": "{{server.build.default.port}}", "voice_ip": "0.0.0.0", "query_port": "{{server.build.default.port}}", "query_ip": "0.0.0.0"}}}',
             'config_logs' => '{"custom": true, "location": "logs/ts3.log"}',
