From d27dff4906f9c0b8373557259dce16bf6222ae60 Mon Sep 17 00:00:00 2001 From: andrei1010 Date: Sat, 5 Jul 2025 17:14:28 +0200 Subject: [PATCH 1/2] fix: fix environment variable parsing for railpack --- packages/server/src/utils/docker/utils.ts | 56 +++++++++++------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts index a9e2f49ab0..b67aa17072 100644 --- a/packages/server/src/utils/docker/utils.ts +++ b/packages/server/src/utils/docker/utils.ts @@ -287,7 +287,7 @@ export const parseEnvironmentKeyValuePair = ( throw new Error(`Invalid environment variable pair: ${pair}`); } - return [key, valueParts.join("")]; + return [key, valueParts.join("=")]; }; export const getEnviromentVariablesObject = ( @@ -370,53 +370,53 @@ export const generateConfigContainer = (application: ApplicationNested) => { }), ...(restartPolicySwarm ? { - RestartPolicy: restartPolicySwarm, - } + RestartPolicy: restartPolicySwarm, + } : {}), ...(placementSwarm ? { - Placement: placementSwarm, - } + Placement: placementSwarm, + } : { - // if app have mounts keep manager as constraint - Placement: { - Constraints: haveMounts ? ["node.role==manager"] : [], - }, - }), + // if app have mounts keep manager as constraint + Placement: { + Constraints: haveMounts ? ["node.role==manager"] : [], + }, + }), ...(labelsSwarm && { Labels: labelsSwarm, }), ...(modeSwarm ? { - Mode: modeSwarm, - } + Mode: modeSwarm, + } : { - // use replicas value if no modeSwarm provided - Mode: { - Replicated: { - Replicas: replicas, - }, + // use replicas value if no modeSwarm provided + Mode: { + Replicated: { + Replicas: replicas, }, - }), + }, + }), ...(rollbackConfigSwarm && { RollbackConfig: rollbackConfigSwarm, }), ...(updateConfigSwarm ? { UpdateConfig: updateConfigSwarm } : { - // default config if no updateConfigSwarm provided - UpdateConfig: { - Parallelism: 1, - Order: "start-first", - }, - }), + // default config if no updateConfigSwarm provided + UpdateConfig: { + Parallelism: 1, + Order: "start-first", + }, + }), ...(networkSwarm ? { - Networks: networkSwarm, - } + Networks: networkSwarm, + } : { - Networks: [{ Target: "dokploy-network" }], - }), + Networks: [{ Target: "dokploy-network" }], + }), }; }; From ee2bbf5e3711dcf9d8cb654ce269674e77f4846a Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Sat, 5 Jul 2025 17:38:16 +0000 Subject: [PATCH 2/2] [autofix.ci] apply automated fixes --- packages/server/src/utils/docker/utils.ts | 54 +++++++++++------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts index b67aa17072..22d85c5710 100644 --- a/packages/server/src/utils/docker/utils.ts +++ b/packages/server/src/utils/docker/utils.ts @@ -370,53 +370,53 @@ export const generateConfigContainer = (application: ApplicationNested) => { }), ...(restartPolicySwarm ? { - RestartPolicy: restartPolicySwarm, - } + RestartPolicy: restartPolicySwarm, + } : {}), ...(placementSwarm ? { - Placement: placementSwarm, - } + Placement: placementSwarm, + } : { - // if app have mounts keep manager as constraint - Placement: { - Constraints: haveMounts ? ["node.role==manager"] : [], - }, - }), + // if app have mounts keep manager as constraint + Placement: { + Constraints: haveMounts ? ["node.role==manager"] : [], + }, + }), ...(labelsSwarm && { Labels: labelsSwarm, }), ...(modeSwarm ? { - Mode: modeSwarm, - } + Mode: modeSwarm, + } : { - // use replicas value if no modeSwarm provided - Mode: { - Replicated: { - Replicas: replicas, + // use replicas value if no modeSwarm provided + Mode: { + Replicated: { + Replicas: replicas, + }, }, - }, - }), + }), ...(rollbackConfigSwarm && { RollbackConfig: rollbackConfigSwarm, }), ...(updateConfigSwarm ? { UpdateConfig: updateConfigSwarm } : { - // default config if no updateConfigSwarm provided - UpdateConfig: { - Parallelism: 1, - Order: "start-first", - }, - }), + // default config if no updateConfigSwarm provided + UpdateConfig: { + Parallelism: 1, + Order: "start-first", + }, + }), ...(networkSwarm ? { - Networks: networkSwarm, - } + Networks: networkSwarm, + } : { - Networks: [{ Target: "dokploy-network" }], - }), + Networks: [{ Target: "dokploy-network" }], + }), }; };