From 95414635da10e9018dad059a9b2330027dffe285 Mon Sep 17 00:00:00 2001 From: Rizon Date: Wed, 27 May 2026 20:52:53 +0100 Subject: [PATCH 1/4] update: dockerImage on Minecraft --- minecraft/install.ts | 12 +----------- minecraft/settings.ts | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/minecraft/install.ts b/minecraft/install.ts index 9c0957e..4cab9ed 100644 --- a/minecraft/install.ts +++ b/minecraft/install.ts @@ -2,16 +2,6 @@ import type { ComposeConfig } from "../compose"; import { escapeComposeValue } from "../compose"; import type { MinecraftSettings } from "./settings"; -export const dockerImage = { - "Java 25": "ghcr.io/pterodactyl/yolks:java_25", - "Java 22": "ghcr.io/pterodactyl/yolks:java_22", - "Java 21": "ghcr.io/pterodactyl/yolks:java_21", - "Java 17": "ghcr.io/pterodactyl/yolks:java_17", - "Java 16": "ghcr.io/pterodactyl/yolks:java_16", - "Java 11": "ghcr.io/pterodactyl/yolks:java_11", - "Java 8": "ghcr.io/pterodactyl/yolks:java_8", -}; - export const buildMinecraftCompose = ( config: ComposeConfig, settings: MinecraftSettings, @@ -23,7 +13,7 @@ export const buildMinecraftCompose = ( return `services: minecraft: - image: ${dockerImage} + image: ${settings.dockerImage} container_name: nodebyte-game ports: - "25565:25565" diff --git a/minecraft/settings.ts b/minecraft/settings.ts index 92f00e4..6f6c121 100644 --- a/minecraft/settings.ts +++ b/minecraft/settings.ts @@ -2,6 +2,20 @@ import { defineSettings } from "../settings"; import type { SettingsValues } from "../settings"; export const minecraftSettings = defineSettings({ + dockerImage: { + default: "ghcr.io/pterodactyl/yolks:java_25", + label: "Docker Image", + options: [ + { value: "ghcr.io/pterodactyl/yolks:java_25" }, + { value: "ghcr.io/pterodactyl/yolks:java_22" }, + { value: "ghcr.io/pterodactyl/yolks:java_21" }, + { value: "ghcr.io/pterodactyl/yolks:java_17" }, + { value: "ghcr.io/pterodactyl/yolks:java_16" }, + { value: "ghcr.io/pterodactyl/yolks:java_11" }, + { value: "ghcr.io/pterodactyl/yolks:java_8" }, + ], + type: "select", + }, allowNether: { default: true, label: "Allow Nether", From 9fad01da2d7708cc7569b9d9c226dc0a84728459 Mon Sep 17 00:00:00 2001 From: Rizon Date: Wed, 27 May 2026 20:56:42 +0100 Subject: [PATCH 2/4] Forgot to change this --- minecraft/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/minecraft/index.ts b/minecraft/index.ts index 0ad61bb..aae70dd 100644 --- a/minecraft/index.ts +++ b/minecraft/index.ts @@ -1,6 +1,6 @@ import type { ComposeConfig } from "../compose"; import { resolveSettings } from "../settings"; -import { buildMinecraftCompose, dockerImage } from "./install"; +import { buildMinecraftCompose } from "./install"; import { minecraftSettings } from "./settings"; const buildCompose = (config: ComposeConfig, raw: unknown): string => @@ -9,7 +9,6 @@ const buildCompose = (config: ComposeConfig, raw: unknown): string => export const minecraft = { buildCompose, description: "Minecraft is a sandbox game where you can build your own world.", - dockerImage, enabled: true, gamedigId: "minecraft", id: "minecraft", From e7631e29137f4e1a6be60e22e0a44c8d2f7fc486 Mon Sep 17 00:00:00 2001 From: Rizon Date: Wed, 27 May 2026 20:58:36 +0100 Subject: [PATCH 3/4] I should really start validating --- minecraft/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/minecraft/index.ts b/minecraft/index.ts index aae70dd..9be234b 100644 --- a/minecraft/index.ts +++ b/minecraft/index.ts @@ -9,6 +9,7 @@ const buildCompose = (config: ComposeConfig, raw: unknown): string => export const minecraft = { buildCompose, description: "Minecraft is a sandbox game where you can build your own world.", + dockerImage: minecraftSettings.dockerImage, enabled: true, gamedigId: "minecraft", id: "minecraft", From c35a9e59a533e4cf2737915dacdcfed10e154759 Mon Sep 17 00:00:00 2001 From: Rizon Date: Thu, 28 May 2026 21:30:45 +0100 Subject: [PATCH 4/4] our own docker image --- minecraft/index.ts | 4 ++-- minecraft/install.ts | 4 +++- minecraft/settings.ts | 19 +++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/minecraft/index.ts b/minecraft/index.ts index 9be234b..0ad61bb 100644 --- a/minecraft/index.ts +++ b/minecraft/index.ts @@ -1,6 +1,6 @@ import type { ComposeConfig } from "../compose"; import { resolveSettings } from "../settings"; -import { buildMinecraftCompose } from "./install"; +import { buildMinecraftCompose, dockerImage } from "./install"; import { minecraftSettings } from "./settings"; const buildCompose = (config: ComposeConfig, raw: unknown): string => @@ -9,7 +9,7 @@ const buildCompose = (config: ComposeConfig, raw: unknown): string => export const minecraft = { buildCompose, description: "Minecraft is a sandbox game where you can build your own world.", - dockerImage: minecraftSettings.dockerImage, + dockerImage, enabled: true, gamedigId: "minecraft", id: "minecraft", diff --git a/minecraft/install.ts b/minecraft/install.ts index 4cab9ed..2fa11ce 100644 --- a/minecraft/install.ts +++ b/minecraft/install.ts @@ -2,6 +2,8 @@ import type { ComposeConfig } from "../compose"; import { escapeComposeValue } from "../compose"; import type { MinecraftSettings } from "./settings"; +export const dockerImage = "ghcr.io/nodebytehosting/games:minecraft-latest" + export const buildMinecraftCompose = ( config: ComposeConfig, settings: MinecraftSettings, @@ -13,7 +15,7 @@ export const buildMinecraftCompose = ( return `services: minecraft: - image: ${settings.dockerImage} + image: ${dockerImage} container_name: nodebyte-game ports: - "25565:25565" diff --git a/minecraft/settings.ts b/minecraft/settings.ts index 6f6c121..24af0c6 100644 --- a/minecraft/settings.ts +++ b/minecraft/settings.ts @@ -2,17 +2,16 @@ import { defineSettings } from "../settings"; import type { SettingsValues } from "../settings"; export const minecraftSettings = defineSettings({ - dockerImage: { - default: "ghcr.io/pterodactyl/yolks:java_25", - label: "Docker Image", + javaVersion: { + default: "25", + label: "Java Version", options: [ - { value: "ghcr.io/pterodactyl/yolks:java_25" }, - { value: "ghcr.io/pterodactyl/yolks:java_22" }, - { value: "ghcr.io/pterodactyl/yolks:java_21" }, - { value: "ghcr.io/pterodactyl/yolks:java_17" }, - { value: "ghcr.io/pterodactyl/yolks:java_16" }, - { value: "ghcr.io/pterodactyl/yolks:java_11" }, - { value: "ghcr.io/pterodactyl/yolks:java_8" }, + { value: "25" }, + { value: "21" }, + { value: "17" }, + { value: "11" }, + { value: "8" }, + ], type: "select", },