From 4798a2b587327a88a8c29cab1a35214267df3ad7 Mon Sep 17 00:00:00 2001 From: dusanjp-and-pasomi Date: Sun, 10 May 2026 19:04:29 +0900 Subject: [PATCH 1/5] Update ComposeService.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 既に shoestringでは docker29対応が出来ていますが、 bootstrapではまだ対応していません。 これは bootstrap側での docker-compose.ymlを docker29に対応させた修正です。 Shoestring already supports Docker 29, but Bootstrap does not yet. This is a fix to update the Bootstrap docker-compose.yml to support Docker 29. --- src/service/ComposeService.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/service/ComposeService.ts b/src/service/ComposeService.ts index a60a4df8..5f4042f3 100644 --- a/src/service/ComposeService.ts +++ b/src/service/ComposeService.ts @@ -136,6 +136,15 @@ export class ComposeService { if (servicePreset.ipv4_address) { service.networks!.default.ipv4_address = servicePreset.ipv4_address; } + + // Docker 29対応: nofileのみ追加 + service.ulimits = _.merge({}, { + nofile: { + soft: 65536, + hard: 65536, + } + }, service.ulimits || {}, servicePreset.compose?.ulimits || {}); + return _.merge({}, service, servicePreset.compose); }; @@ -207,7 +216,7 @@ export class ComposeService { stopGracePeriod: n.nodeStopGracePeriod || presetData.nodeStopGracePeriod, }, { - user: serverDebugMode === debugFlag ? undefined : user, // if debug on, run as root + user: serverDebugMode === debugFlag ? undefined : user, container_name: n.name, image: presetData.symbolServerImage, command: serverCommand, @@ -234,7 +243,7 @@ export class ComposeService { stopGracePeriod: n.brokerStopGracePeriod || presetData.brokerStopGracePeriod, }, { - user: brokerDebugMode === debugFlag ? undefined : user, // if debug on, run as root + user: brokerDebugMode === debugFlag ? undefined : user, container_name: n.brokerName, image: nodeService.image, working_dir: nodeWorkingDirectory, @@ -251,7 +260,8 @@ export class ComposeService { } }), ); - const restInternalPort = 3000; // Move to shared? + + const restInternalPort = 3000; await Promise.all( (presetData.gateways || []) .filter((d) => !d.excludeDockerService) From ff28633c50cc9d4aeda2ba1017f5f80bccf0ea9e Mon Sep 17 00:00:00 2001 From: dusanjp-and-pasomi Date: Mon, 11 May 2026 19:18:03 +0900 Subject: [PATCH 2/5] Update ComposeService.ts --- src/service/ComposeService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/ComposeService.ts b/src/service/ComposeService.ts index 5f4042f3..7212ae1b 100644 --- a/src/service/ComposeService.ts +++ b/src/service/ComposeService.ts @@ -216,7 +216,7 @@ export class ComposeService { stopGracePeriod: n.nodeStopGracePeriod || presetData.nodeStopGracePeriod, }, { - user: serverDebugMode === debugFlag ? undefined : user, + user: serverDebugMode === debugFlag ? undefined : user, // if debug on, run as root container_name: n.name, image: presetData.symbolServerImage, command: serverCommand, From 23c4217579fd154d193edf4b742fb40f7442b41c Mon Sep 17 00:00:00 2001 From: dusanjp-and-pasomi Date: Mon, 11 May 2026 19:19:50 +0900 Subject: [PATCH 3/5] Update ComposeService.ts --- src/service/ComposeService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/ComposeService.ts b/src/service/ComposeService.ts index 7212ae1b..379f78a5 100644 --- a/src/service/ComposeService.ts +++ b/src/service/ComposeService.ts @@ -243,7 +243,7 @@ export class ComposeService { stopGracePeriod: n.brokerStopGracePeriod || presetData.brokerStopGracePeriod, }, { - user: brokerDebugMode === debugFlag ? undefined : user, + user: brokerDebugMode === debugFlag ? undefined : user, // if debug on, run as root container_name: n.brokerName, image: nodeService.image, working_dir: nodeWorkingDirectory, From 7f345a70a08573117cbf7c6b1edabdf32a83f612 Mon Sep 17 00:00:00 2001 From: dusanjp-and-pasomi Date: Mon, 11 May 2026 19:21:38 +0900 Subject: [PATCH 4/5] Update ComposeService.ts --- src/service/ComposeService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/ComposeService.ts b/src/service/ComposeService.ts index 379f78a5..d5cf730b 100644 --- a/src/service/ComposeService.ts +++ b/src/service/ComposeService.ts @@ -261,7 +261,7 @@ export class ComposeService { }), ); - const restInternalPort = 3000; + const restInternalPort = 3000; // Move to shared? await Promise.all( (presetData.gateways || []) .filter((d) => !d.excludeDockerService) From 310f2ac848251d7049bfadc72b2b4d3ec3785c18 Mon Sep 17 00:00:00 2001 From: dusanjp-and-pasomi Date: Mon, 11 May 2026 19:24:46 +0900 Subject: [PATCH 5/5] Update ComposeService.ts --- src/service/ComposeService.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/service/ComposeService.ts b/src/service/ComposeService.ts index d5cf730b..0fcb8c02 100644 --- a/src/service/ComposeService.ts +++ b/src/service/ComposeService.ts @@ -260,7 +260,6 @@ export class ComposeService { } }), ); - const restInternalPort = 3000; // Move to shared? await Promise.all( (presetData.gateways || [])