feat: use Yolks base image for multiarch support

Changes to Yolks base image for multiarch support of AMD64 and ARM64.
Jaryt · Jan 22, 2022 · 28c587a · 28c587a
1 parent ca944dd
commit 28c587a
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 25 deletions.
diff --git a/bots/discord/deno/egg-deno-generic.json b/bots/discord/deno/egg-deno-generic.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-03-30T00:48:40+00:00",
+    "exported_at": "2022-01-22T05:40:17-05:00",
     "name": "Deno Generic",
     "author": "[email protected]",
     "description": "A generic egg to run deno code.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/deno run {{JS_FILE}}",

diff --git a/bots/discord/lua/luvit/egg-luvit-generic.json b/bots/discord/lua/luvit/egg-luvit-generic.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-03-30T02:11:23+00:00",
+    "exported_at": "2022-01-22T05:40:57-05:00",
     "name": "luvit generic",
     "author": "[email protected]",
     "description": "A generic luvit egg This will clone a git repo for a bot. It defaults to master if no branch is specified.\r\n\r\nSupports the discordia lua framework.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/luvit {{LUA_FILE}}",

diff --git a/game_eggs/factorio/factorio-modupdate/egg-factorio-modupdate.json b/game_eggs/factorio/factorio-modupdate/egg-factorio-modupdate.json
@@ -4,19 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-01-15T16:32:57+01:00",
+    "exported_at": "2022-01-22T05:41:57-05:00",
     "name": "Factorio-ModUpdate",
     "author": "[email protected]",
     "description": "The vanilla Factorio server. With automatic Mod Updates after ReInstall.\r\n\r\nhttps:\/\/www.factorio.com\/",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
+    "file_denylist": [],
     "startup": ".\/bin\/x64\/factorio --port {{SERVER_PORT}} --server-settings data\/server-settings.json --start-server {{SAVE_NAME}}.zip",
     "config": {
         "files": "{\r\n    \"data\/server-settings.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"name\": \"{{server.build.env.SERVER_NAME}}\",\r\n            \"description\": \"{{server.build.env.SERVER_DESC}}\",\r\n            \"max_players\": \"{{server.build.env.MAX_SLOTS}}\",\r\n            \"username\": \"{{server.build.env.SERVER_USERNAME}}\",\r\n            \"token\": \"{{server.build.env.SERVER_TOKEN}}\",\r\n            \"autosave_interval\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n            \"autosave_slots\": \"{{server.build.env.SAVE_SLOTS}}\",\r\n            \"afk_autokick_interval\": \"{{server.build.env.AFK_KICK}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Hosting game at\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"factorio-current.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Hosting game at\"\r\n}",
+        "logs": "{}",
         "stop": "\/quit"
     },
     "scripts": {
@@ -118,4 +119,4 @@
             "rules": "required|numeric|digits_between:1,3"
         }
     ]
-}
+}
diff --git a/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json b/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-04T00:38:57+03:00",
+    "exported_at": "2022-01-22T05:42:40-05:00",
     "name": "Vanilla Bedrock",
     "author": "[email protected]",
     "description": "Bedrock Edition (also known as the Bedrock Version, Bedrock Codebase, Bedrock Engine or just Bedrock) refers to the multi-platform family of editions of Minecraft developed by Mojang AB, Microsoft Studios, 4J Studios, and SkyBox Labs. Prior to this term, as the engine originated with Pocket Edition, this entire product family was referred to as \"Pocket Edition\", \"MCPE\", or \"Pocket\/Windows 10 Edition\".",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/bedrock_server",
@@ -83,4 +83,4 @@
             "rules": "required|string|in:true,false"
         }
     ]
-}
+}
diff --git a/game_eggs/rdr/redm/egg-red-m.json b/game_eggs/rdr/redm/egg-red-m.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2022-01-11T10:01:29-05:00",
+    "exported_at": "2022-01-22T05:43:25-05:00",
     "name": "RedM",
     "author": "[email protected]",
     "description": "A new RedM egg for the latest builds due to recent changes in RedM",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": "$(pwd)\/alpine\/opt\/cfx-server\/ld-musl-x86_64.so.1 --library-path \"$(pwd)\/alpine\/usr\/lib\/v8\/:$(pwd)\/alpine\/lib\/:$(pwd)\/alpine\/usr\/lib\/\" -- $(pwd)\/alpine\/opt\/cfx-server\/FXServer +set citizen_dir $(pwd)\/alpine\/opt\/cfx-server\/citizen\/ +set sv_licenseKey {{CFX_LICENSE}} +set steam_webApiKey {{STEAM_WEBAPIKEY}} +set sv_maxplayers {{MAX_PLAYERS}} +exec server.cfg +set gamename rdr3",
@@ -83,4 +83,4 @@
             "rules": "string|nullable"
         }
     ]
-}
+}
diff --git a/game_eggs/teeworlds/egg-teeworlds.json b/game_eggs/teeworlds/egg-teeworlds.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T03:45:27+03:00",
+    "exported_at": "2022-01-22T05:44:04-05:00",
     "name": "Teeworlds",
     "author": "[email protected]",
     "description": "Teeworlds is a free online multiplayer game, available for all major operating systems. Battle with up to 16 players in a variety of game modes, including Team Deathmatch and Capture The Flag. You can even design your own maps!",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/teeworlds_srv",
@@ -47,4 +47,4 @@
             "rules": "nullable|string"
         }
     ]
-}
+}
diff --git a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json
@@ -4,19 +4,19 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-11-29T09:48:58+01:00",
+    "exported_at": "2022-01-22T05:44:42-05:00",
     "name": "Terraria Vanilla",
     "author": "[email protected]",
     "description": "Dig, fight, explore, build! Nothing is impossible in this action-packed adventure game.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/TerrariaServer.bin.x86_64 -config serverconfig.txt",
     "config": {
         "files": "{\r\n    \"serverconfig.txt\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"worldpath\": \"\/home\/container\/saves\/Worlds\",\r\n            \"worldname\": \"{{server.build.env.WORLD_NAME}}\",\r\n            \"world\": \"\/home\/container\/saves\/Worlds\/{{server.build.env.WORLD_NAME}}.wld\",\r\n            \"difficulty\": \"{{server.build.env.WORLD_DIFFICULTY}}\",\r\n            \"autocreate\": \"{{server.build.env.WORLD_SIZE}}\",\r\n            \"port\": \"{{server.build.default.port}}\",\r\n            \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n            \"motd\": \"{{server.build.env.SERVER_MOTD}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\"done\": \"Type 'help' for a list of commands\"}",
+        "startup": "{\r\n    \"done\": \"Type 'help' for a list of commands\"\r\n}",
         "logs": "{}",
         "stop": "exit"
     },

diff --git a/monitoring/prometheus/egg-prometheus.json b/monitoring/prometheus/egg-prometheus.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-07T19:53:13+02:00",
+    "exported_at": "2022-01-22T05:45:16-05:00",
     "name": "Prometheus",
     "author": "[email protected]",
     "description": "The Prometheus monitoring system and time series database.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/prometheus --web.listen-address=0.0.0.0:{{SERVER_PORT}} --config.file=\/home\/container\/prometheus.yml --storage.tsdb.path=\/home\/container\/data --web.console.templates=\/home\/container\/consoles --web.console.libraries=\/home\/container\/console_libraries --web.config.file=\/home\/container\/prometheus.web.yml",

diff --git a/software/grafana/egg-grafana.json b/software/grafana/egg-grafana.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-06T23:52:45+02:00",
+    "exported_at": "2022-01-22T05:46:01-05:00",
     "name": "Grafana",
     "author": "[email protected]",
     "description": "The open and composable observability and data visualization platform.\r\nVisualize metrics, logs, and traces from multiple sources like Prometheus, Loki, Elasticsearch, InfluxDB, Postgres and many more.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/bin\/grafana-server web",