dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: secrets

Browse Source
This commit is contained in:
Andras Bacsai
2023-01-11 09:29:59 +01:00
parent c37367d018
commit 305823db00
1 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
apps/api/src/lib/common.ts
View File

@@ -1884,6 +1884,30 @@ export async function pushToRegistry(
}); });
} }
function parseSecret(secret, isBuild) {
if (secret.value.includes('$')) {
secret.value = secret.value.replaceAll('$', '$$$$');
}
if (secret.value.includes('\\n')) {
if (isBuild) {
return `ARG ${secret.name}=${secret.value}`;
} else {
return `${secret.name}=${secret.value}`;
}
} else if (secret.value.includes(' ')) {
if (isBuild) {
return `ARG ${secret.name}='${secret.value}'`;
} else {
return `${secret.name}='${secret.value}'`;
}
} else {
if (isBuild) {
return `ARG ${secret.name}=${secret.value}`;
} else {
return `${secret.name}=${secret.value}`;
}
}
}
export function generateSecrets( export function generateSecrets(
secrets: Array<any>, secrets: Array<any>,
pullmergeRequestId: string, pullmergeRequestId: string,
@@ -1899,22 +1923,7 @@ export function generateSecrets(
return; return;
} }
const build = isBuild && secret.isBuildSecret; const build = isBuild && secret.isBuildSecret;
if (secret.value.includes('$')) { envs.push(parseSecret(secret, build));
secret.value = secret.value.replaceAll('$', '$$$$');
}
if (secret.value.includes(' ') || secret.value.includes('\\n')) {
if (build) {
envs.push(`ARG ${secret.name}='${secret.value}'`);
} else {
envs.push(`${secret.name}='${secret.value}'`);
}
} else {
if (build) {
envs.push(`ARG ${secret.name}=${secret.value}`);
} else {
envs.push(`${secret.name}=${secret.value}`);
}
}
}); });
} }
if (!pullmergeRequestId && normalSecrets.length > 0) { if (!pullmergeRequestId && normalSecrets.length > 0) {
@@ -1922,25 +1931,11 @@ export function generateSecrets(
if (isBuild && !secret.isBuildSecret) { if (isBuild && !secret.isBuildSecret) {
return; return;
} }
if (secret.value.includes('$')) {
secret.value = secret.value.replaceAll('$', '$$$$');
}
const build = isBuild && secret.isBuildSecret; const build = isBuild && secret.isBuildSecret;
if (secret.value.includes(' ') || secret.value.includes('\\n')) { envs.push(parseSecret(secret, build));
if (build) {
envs.push(`ARG ${secret.name}='${secret.value}'`);
} else {
envs.push(`${secret.name}='${secret.value}'`);
}
} else {
if (build) {
envs.push(`ARG ${secret.name}=${secret.value}`);
} else {
envs.push(`${secret.name}=${secret.value}`);
}
}
}); });
} }
console.log(envs);
const portFound = envs.filter((env) => env.startsWith('PORT')); const portFound = envs.filter((env) => env.startsWith('PORT'));
if (portFound.length === 0 && port && !isBuild) { if (portFound.length === 0 && port && !isBuild) {
envs.push(`PORT=${port}`); envs.push(`PORT=${port}`);