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

fix: $ sign in secrets

Browse Source
This commit is contained in:
Andras Bacsai
2023-01-10 10:52:40 +01:00
parent ee40120496
commit 9284e42b62
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1899,15 +1899,22 @@ export function generateSecrets(
return; return;
} }
const build = isBuild && secret.isBuildSecret; const build = isBuild && secret.isBuildSecret;
if (build) { if (secret.value.includes('$')) {
secret.value = secret.value.replaceAll('$', '$$$$');
}
if (secret.value.includes(' ') || secret.value.includes('\\n')) { if (secret.value.includes(' ') || secret.value.includes('\\n')) {
if (build) {
envs.push(`ARG ${secret.name}='${secret.value}'`); envs.push(`ARG ${secret.name}='${secret.value}'`);
} else { } else {
envs.push(`ARG ${secret.name}=${secret.value}`); envs.push(`${secret.name}='${secret.value}'`);
} }
} else {
if (build) {
envs.push(`ARG ${secret.name}=${secret.value}`);
} else { } else {
envs.push(`${secret.name}=${secret.value}`); envs.push(`${secret.name}=${secret.value}`);
} }
}
}); });
} }
if (!pullmergeRequestId && normalSecrets.length > 0) { if (!pullmergeRequestId && normalSecrets.length > 0) {
@@ -1915,16 +1922,23 @@ 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 (build) {
if (secret.value.includes(' ') || secret.value.includes('\\n')) { if (secret.value.includes(' ') || secret.value.includes('\\n')) {
if (build) {
envs.push(`ARG ${secret.name}='${secret.value}'`); envs.push(`ARG ${secret.name}='${secret.value}'`);
} else { } else {
envs.push(`ARG ${secret.name}=${secret.value}`); envs.push(`${secret.name}='${secret.value}'`);
} }
} else {
if (build) {
envs.push(`ARG ${secret.name}=${secret.value}`);
} else { } else {
envs.push(`${secret.name}=${secret.value}`); envs.push(`${secret.name}=${secret.value}`);
} }
}
}); });
} }
const portFound = envs.filter((env) => env.startsWith('PORT')); const portFound = envs.filter((env) => env.startsWith('PORT'));