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

fix: build secrets for apps

Browse Source
This commit is contained in:
Andras Bacsai
2022-09-10 07:14:30 +00:00
parent d6d3fb46cc
commit bc66b98176
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/api/src/lib/buildPacks/common.ts
View File

@@ -556,7 +556,6 @@ export function checkPnpm(installCommand = null, buildCommand = null, startComma
); );
} }
export async function buildImage({ export async function buildImage({
applicationId, applicationId,
tag, tag,
@@ -677,8 +676,6 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
secrets, secrets,
pullmergeRequestId pullmergeRequestId
} = data; } = data;
const isPnpm = checkPnpm(installCommand, buildCommand); const isPnpm = checkPnpm(installCommand, buildCommand);
const Dockerfile: Array<string> = []; const Dockerfile: Array<string> = [];
Dockerfile.push(`FROM ${imageForBuild}`); Dockerfile.push(`FROM ${imageForBuild}`);

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

@@ -28,6 +28,7 @@ export default async function (data) {
if (secrets.length > 0) { if (secrets.length > 0) {
secrets.forEach((secret) => { secrets.forEach((secret) => {
if (secret.isBuildSecret) { if (secret.isBuildSecret) {
// TODO: fix secrets
if ( if (
(pullmergeRequestId && secret.isPRMRSecret) || (pullmergeRequestId && secret.isPRMRSecret) ||
(!pullmergeRequestId && !secret.isPRMRSecret) (!pullmergeRequestId && !secret.isPRMRSecret)

1
apps/api/src/lib/buildPacks/node.ts
View File

@@ -22,6 +22,7 @@ const createDockerfile = async (data, image): Promise<void> => {
if (secrets.length > 0) { if (secrets.length > 0) {
secrets.forEach((secret) => { secrets.forEach((secret) => {
if (secret.isBuildSecret) { if (secret.isBuildSecret) {
console.log(secret)
if (pullmergeRequestId) { if (pullmergeRequestId) {
const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret) const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
if (isSecretFound.length > 0) { if (isSecretFound.length > 0) {