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

fix: storage for compose bp + debug on

Browse Source
This commit is contained in:
Andras Bacsai
2022-11-23 10:57:52 +01:00
parent d402fd5690
commit 530e7e494f
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -470,9 +470,9 @@ export const saveBuildLog = async ({
const addTimestamp = `[${generateTimestamp()}] ${line}`; const addTimestamp = `[${generateTimestamp()}] ${line}`;
const fluentBitUrl = isDev ? process.env.COOLIFY_CONTAINER_DEV === 'true' ? 'http://coolify-fluentbit:24224' : 'http://localhost:24224' : 'http://coolify-fluentbit:24224'; const fluentBitUrl = isDev ? process.env.COOLIFY_CONTAINER_DEV === 'true' ? 'http://coolify-fluentbit:24224' : 'http://localhost:24224' : 'http://coolify-fluentbit:24224';
if (isDev && !process.env.COOLIFY_CONTAINER_DEV) { // if (isDev && !process.env.COOLIFY_CONTAINER_DEV) {
console.debug(`[${applicationId}] ${addTimestamp}`); console.debug(`[${applicationId}] ${addTimestamp}`);
} // }
try { try {
return await got.post(`${fluentBitUrl}/${applicationId}_buildlog_${buildId}.csv`, { return await got.post(`${fluentBitUrl}/${applicationId}_buildlog_${buildId}.csv`, {
json: { json: {

6
apps/api/src/lib/buildPacks/compose.ts
View File

@@ -86,9 +86,11 @@ export default async function (data) {
let [v, path, permission] = volume.split(':'); let [v, path, permission] = volume.split(':');
if (!path) { if (!path) {
path = v; path = v;
v = `${applicationId}${v.replace(/\//gi, '-')}` // v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`
v = `${applicationId}${v}`
} else { } else {
v = `${applicationId}-${v}` // v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`
v = `${applicationId}${v}`
} }
composeVolumes[v] = { composeVolumes[v] = {
name: v name: v

2
apps/api/src/lib/scheduler.ts
View File

@@ -9,7 +9,7 @@ Bree.extend(TSBree);
const options: any = { const options: any = {
defaultExtension: 'js', defaultExtension: 'js',
logger: new Cabin(), logger: false,
// logger: false, // logger: false,
// workerMessageHandler: async ({ name, message }) => { // workerMessageHandler: async ({ name, message }) => {
// if (name === 'deployApplication' && message?.deploying) { // if (name === 'deployApplication' && message?.deploying) {

4
apps/ui/src/routes/applications/[id]/storages.svelte
View File

@@ -37,9 +37,9 @@
let [volume, target] = volumeName.split(':'); let [volume, target] = volumeName.split(':');
if (!target) { if (!target) {
target = volume; target = volume;
volume = `${application.id}${volume.replace(/\//gi, '-')}`; volume = `${application.id}${volume.replace(/\//gi, '-').replace(/\./gi, '')}`;
} else { } else {
volume = `${application.id}-${volume}`; volume = `${application.id}${volume.replace(/\//gi, '-').replace(/\./gi, '')}`;
} }
predefinedVolumes.push({ id: volume, path: target, predefined: true }); predefinedVolumes.push({ id: volume, path: target, predefined: true });
} }