From e0e7ae699eeec863df4d00646110d6b29170f09a Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Mon, 15 Nov 2021 10:47:24 -0300
Subject: [PATCH] VIAaaS: update java, startup detection, use ash (#1362)

---
 .../proxy/java/viaaas/egg-v-i-aaa-s.json      | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json
index 19837abd..48095697 100644
--- a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json
+++ b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json
@@ -4,33 +4,34 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-28T11:55:37-04:00",
+    "exported_at": "2021-10-16T11:26:14-03:00",
     "name": "VIAaaS",
     "author": "regulad@outlook.com",
     "description": "VIAaaS - ViaVersion as a Service - Standalone ViaVersion proxy",
     "features": null,
     "images": [
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort={{WEBSERVER_PORT}}",
     "config": {
         "files": "{\r\n    \"config\/viaaas.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"port\": \"{{server.build.default.port}}\",\r\n            \"bind-address\": \"0.0.0.0\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Application started:\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Application started in \"\r\n}",
         "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
         "stop": "end"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# VIAaaS Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -Lf -o ${SERVER_JARFILE} \"https:\/\/jitpack.io\/com\/github\/ViaVersion\/VIAaaS\/master-SNAPSHOT\/VIAaaS-master-SNAPSHOT-all.jar\"",
-            "container": "debian:buster-slim",
-            "entrypoint": "bash"
+            "script": "#!\/bin\/ash\r\n# VIAaaS Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\ncd \/mnt\/server\r\nwget -O ${SERVER_JARFILE} \"https:\/\/jitpack.io\/com\/github\/ViaVersion\/VIAaaS\/master-SNAPSHOT\/VIAaaS-master-SNAPSHOT-all.jar\"",
+            "container": "ghcr.io/pterodactyl/installers:alpine",
+            "entrypoint": "ash"
         }
     },
     "variables": [
         {
-            "name": "VIAaaS Jar File",
-            "description": "The name of the jarfile to be used when downloading & running VIAaaS.",
+            "name": "VIAaaS JAR File",
+            "description": "The name of the JAR file to be used when downloading & running VIAaaS.",
             "env_variable": "SERVER_JARFILE",
             "default_value": "VIAaaS-all.jar",
             "user_viewable": true,
@@ -38,8 +39,8 @@
             "rules": "required|string"
         },
         {
-            "name": "Webserver Port",
-            "description": "The port to listen to webserver connections on.",
+            "name": "Web Server Port",
+            "description": "The port to listen to web server connections on.",
             "env_variable": "WEBSERVER_PORT",
             "default_value": "25543",
             "user_viewable": true,
@@ -47,4 +48,4 @@
             "rules": "required|string"
         }
     ]
-}
\ No newline at end of file
+}