From aa16d8cfe3978ef0624dfa45b8dbd99aa31136f9 Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Fri, 27 Oct 2023 09:53:48 -0300 Subject: [PATCH] fix logic for build raw --- javascript/packages/orchestrator/src/configGenerator.ts | 6 +++--- .../packages/orchestrator/src/providers/k8s/chainSpec.ts | 5 ++++- .../packages/orchestrator/src/providers/podman/chainSpec.ts | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/javascript/packages/orchestrator/src/configGenerator.ts b/javascript/packages/orchestrator/src/configGenerator.ts index 20f007e1f..378385862 100644 --- a/javascript/packages/orchestrator/src/configGenerator.ts +++ b/javascript/packages/orchestrator/src/configGenerator.ts @@ -182,9 +182,9 @@ export async function generateNetworkSpec( .chain_spec_command ? config.relaychain.chain_spec_command : DEFAULT_CHAIN_SPEC_COMMAND.replace( - "{{chainName}}", - networkSpec.relaychain.chain, - ).replace("{{DEFAULT_COMMAND}}", networkSpec.relaychain.defaultCommand); + "{{DEFAULT_COMMAND}}", + networkSpec.relaychain.defaultCommand, + ); } const relayChainBootnodes: string[] = []; diff --git a/javascript/packages/orchestrator/src/providers/k8s/chainSpec.ts b/javascript/packages/orchestrator/src/providers/k8s/chainSpec.ts index 4de6975a9..36a98fdf3 100644 --- a/javascript/packages/orchestrator/src/providers/k8s/chainSpec.ts +++ b/javascript/packages/orchestrator/src/providers/k8s/chainSpec.ts @@ -30,7 +30,10 @@ export async function setupChainSpec( "/" + DEFAULT_CHAIN_SPEC.replace(/{{chainName}}/gi, chainName); - const fullCommand = `${chainSpecCommand} > ${plainChainSpecOutputFilePath}`; + const fullCommand = `${chainSpecCommand.replace( + /{{chainName}}/gi, + chainName, + )} > ${plainChainSpecOutputFilePath}`; const node = await createTempNodeDef( "temp", defaultImage, diff --git a/javascript/packages/orchestrator/src/providers/podman/chainSpec.ts b/javascript/packages/orchestrator/src/providers/podman/chainSpec.ts index c8fe54f54..b4e2a688f 100644 --- a/javascript/packages/orchestrator/src/providers/podman/chainSpec.ts +++ b/javascript/packages/orchestrator/src/providers/podman/chainSpec.ts @@ -27,7 +27,10 @@ export async function setupChainSpec( "/" + DEFAULT_CHAIN_SPEC.replace(/{{chainName}}/gi, chainName); // set output of command - const fullCommand = `${chainSpecCommand} > ${plainChainSpecOutputFilePath}`; + const fullCommand = `${chainSpecCommand.replace( + /{{chainName}}/gi, + chainName, + )} > ${plainChainSpecOutputFilePath}`; const node = await createTempNodeDef( "temp", defaultImage,