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

fixes

Browse Source
This commit is contained in:
Andras Bacsai
2022-12-07 13:45:56 +01:00
parent c0882dffde
commit 0dad616c38
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/api/src/lib/buildPacks/docker.ts
View File

@@ -20,7 +20,11 @@ export default async function (data) {
.toString()
.trim()
.split('\n');
Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
Dockerfile.forEach((line, index) => {
if (line.startsWith('FROM')) {
Dockerfile.splice(index + 1, 0, `LABEL coolify.buildId=${buildId}`);
}
});
if (secrets.length > 0) {
secrets.forEach((secret) => {
if (secret.isBuildSecret) {
@@ -28,11 +32,9 @@ export default async function (data) {
(pullmergeRequestId && secret.isPRMRSecret) ||
(!pullmergeRequestId && !secret.isPRMRSecret)
) {
Dockerfile.unshift(`ARG ${secret.name}=${secret.value}`);
Dockerfile.forEach((line, index) => {
if (line.startsWith('FROM')) {
Dockerfile.splice(index + 1, 0, `ARG ${secret.name}`);
Dockerfile.splice(index + 1, 0, `ARG ${secret.name}=${secret.value}`);
}
});
}