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

fix: network in compose files

Browse Source
This commit is contained in:
Andras Bacsai
2023-02-17 14:45:13 +01:00
parent c89a959fe8
commit 63ec2a33ae
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,12 +66,12 @@ export default async function (data) {
} }
} }
} }
if (build.length > 0 || buildArgs.length > 0 ) { if (build.length > 0 || buildArgs.length > 0) {
value['build'] = { value['build'] = {
...build, ...build,
args: finalArgs args: finalArgs
}; };
} }
value['labels'] = labels; value['labels'] = labels;
// TODO: If we support separated volume for each service, we need to add it here // TODO: If we support separated volume for each service, we need to add it here
@@ -104,8 +104,11 @@ export default async function (data) {
name: network name: network
}; };
}); });
value['networks'] = [...(value['networks'] || ''), network];
} else {
value['networks'] = [network];
} }
value['networks'] = [...(value['networks'] || ''), network];
dockerComposeYaml.services[key] = { dockerComposeYaml.services[key] = {
...dockerComposeYaml.services[key], ...dockerComposeYaml.services[key],
restart: defaultComposeConfiguration(network).restart, restart: defaultComposeConfiguration(network).restart,

2
apps/ui/src/routes/applications/[id]/logs/index.svelte
View File

@@ -111,7 +111,7 @@
<div class="title font-bold pb-3">Application Logs</div> <div class="title font-bold pb-3">Application Logs</div>
</div> </div>
</div> </div>
<div class="flex gap-2 lg:gap-8 pb-4"> <div class="grid grid-cols-3 gap-2 lg:gap-8 pb-4">
{#each services as service} {#each services as service}
<button <button
on:click={() => selectService(service, true)} on:click={() => selectService(service, true)}