The_Great_Archive/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-09-14 11:06:15 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1983 from TorstenDittmann/fix-railpack-env-vars
Some checks are pending
Auto PR to main when version changes / create-pr (push) Waiting to run
Details
Build Docker images / build-and-push-cloud-image (push) Waiting to run
Details
Build Docker images / build-and-push-schedule-image (push) Waiting to run
Details
Build Docker images / build-and-push-server-image (push) Waiting to run
Details
Dokploy Docker Build / docker-amd (push) Waiting to run
Details
Dokploy Docker Build / docker-arm (push) Waiting to run
Details
Dokploy Docker Build / combine-manifests (push) Blocked by required conditions
Details
Dokploy Docker Build / generate-release (push) Blocked by required conditions
Details
autofix.ci / format (push) Waiting to run
Details
Dokploy Monitoring Build / docker-amd (push) Waiting to run
Details
Dokploy Monitoring Build / docker-arm (push) Waiting to run
Details
Dokploy Monitoring Build / combine-manifests (push) Blocked by required conditions
Details

Browse Source 
fix[railpack]: env parsing and update railpack to v0.0.66
This commit is contained in:
Mauricio Siu 2025-06-01 18:13:11 -06:00 committed by GitHub
commit e53c67f0d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/server/src/utils/builders/railpack.ts
View File

@ -2,7 +2,10 @@ import { createHash } from "node:crypto";
import type { WriteStream } from "node:fs";
import { nanoid } from "nanoid";
import type { ApplicationNested } from ".";
import { prepareEnvironmentVariables } from "../docker/utils";
import {
parseEnvironmentKeyValuePair,
prepareEnvironmentVariables,
} from "../docker/utils";
import { getBuildAppDirectory } from "../filesystem/directory";
import { execAsync } from "../process/execAsync";
import { spawnAsync } from "../process/spawnAsync";
@ -81,10 +84,10 @@ export const buildRailpack = async (
// Add secrets properly formatted
const env: { [key: string]: string } = {};
for (const envVar of envVariables) {
const [key, value] = envVar.split("=");
for (const pair of envVariables) {
const [key, value] = parseEnvironmentKeyValuePair(pair);
if (key && value) {
buildArgs.push("--secret", `id=${key},env='${key}'`);
buildArgs.push("--secret", `id=${key},env=${key}`);
env[key] = value;
}
}
@ -161,11 +164,11 @@ export const getRailpackCommand = (
// Add secrets properly formatted
const exportEnvs = [];
for (const envVar of envVariables) {
const [key, value] = envVar.split("=");
for (const pair of envVariables) {
const [key, value] = parseEnvironmentKeyValuePair(pair);
if (key && value) {
buildArgs.push("--secret", `id=${key},env='${key}'`);
exportEnvs.push(`export ${key}=${value}`);
buildArgs.push("--secret", `id=${key},env=${key}`);
exportEnvs.push(`export ${key}='${value}'`);
}
}

13
packages/server/src/utils/docker/utils.ts
View File

@ -279,6 +279,17 @@ export const prepareEnvironmentVariables = (
return resolvedVars;
};
export const parseEnvironmentKeyValuePair = (
pair: string,
): [string, string] => {
const [key, ...valueParts] = pair.split("=");
if (!key || !valueParts.length) {
throw new Error(`Invalid environment variable pair: ${pair}`);
}
return [key, valueParts.join("")];
};
export const getEnviromentVariablesObject = (
input: string | null,
projectEnv?: string | null,
@ -288,7 +299,7 @@ export const getEnviromentVariablesObject = (
const jsonObject: Record<string, string> = {};
for (const pair of envs) {
const [key, value] = pair.split("=");
const [key, value] = parseEnvironmentKeyValuePair(pair);
if (key && value) {
jsonObject[key] = value;
}