Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge branch 'arm' of github.com:coollabsio/coolify into arm

Browse Source
This commit is contained in:
Andras Bacsai 2022-04-11 22:31:32 +02:00
commit a1b3b7b687
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/buildPacks/docker.ts
View File

@ -26,14 +26,17 @@ export default async function ({
if (secrets.length > 0) { if (secrets.length > 0) {
secrets.forEach((secret) => { secrets.forEach((secret) => {
if (secret.isBuildSecret) { if (secret.isBuildSecret) {
if (pullmergeRequestId) { if (
if (secret.isPRMRSecret) { (pullmergeRequestId && secret.isPRMRSecret) ||
Dockerfile.push(`ARG ${secret.name}=${secret.value}`); (!pullmergeRequestId && !secret.isPRMRSecret)
} ) {
} else { Dockerfile.unshift(`ARG ${secret.name}=${secret.value}`);
if (!secret.isPRMRSecret) {
Dockerfile.push(`ARG ${secret.name}=${secret.value}`); Dockerfile.forEach((line, index) => {
} if (line.startsWith('FROM')) {
Dockerfile.splice(index + 1, 0, `ARG ${secret.name}`);
}
});
} }
} }
}); });