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

fix: check compose domains in general

Browse Source
This commit is contained in:
Andras Bacsai 2022-10-12 11:17:02 +02:00
parent 7a053ce697
commit f734154da8
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/api/src/lib/common.ts
View File

@ -264,7 +264,9 @@ export async function isDomainConfigured({
where: { where: {
OR: [ OR: [
{ fqdn: { endsWith: `//${nakedDomain}` } }, { fqdn: { endsWith: `//${nakedDomain}` } },
{ fqdn: { endsWith: `//www.${nakedDomain}` } } { fqdn: { endsWith: `//www.${nakedDomain}` } },
{ dockerComposeConfiguration: { contains: `//${nakedDomain}` } },
{ dockerComposeConfiguration: { contains: `//www.${nakedDomain}` } }
], ],
id: { not: id }, id: { not: id },
destinationDocker: { destinationDocker: {
@ -598,7 +600,7 @@ export async function executeDockerCmd({ debug, buildId, applicationId, dockerId
command = command.replace(/docker compose/gi, 'docker-compose'); command = command.replace(/docker compose/gi, 'docker-compose');
} }
} }
if (command.startsWith(`docker build`) || command.startsWith(`pack build`)|| command.startsWith(`docker compose build`)) { if (command.startsWith(`docker build`) || command.startsWith(`pack build`) || command.startsWith(`docker compose build`)) {
return await asyncExecShellStream({ debug, buildId, applicationId, command, engine }); return await asyncExecShellStream({ debug, buildId, applicationId, command, engine });
} }
return await execaCommand(command, { env: { DOCKER_BUILDKIT: "1", DOCKER_HOST: engine }, shell: true }) return await execaCommand(command, { env: { DOCKER_BUILDKIT: "1", DOCKER_HOST: engine }, shell: true })

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

@ -243,13 +243,24 @@
nonWWWDomain = application.fqdn && getDomain(application.fqdn).replace(/^www\./, ''); nonWWWDomain = application.fqdn && getDomain(application.fqdn).replace(/^www\./, '');
if (application.deploymentType) if (application.deploymentType)
application.deploymentType = application.deploymentType.toLowerCase(); application.deploymentType = application.deploymentType.toLowerCase();
!isBot && if (!isBot) {
(await post(`/applications/${id}/check`, { await post(`/applications/${id}/check`, {
fqdn: application.fqdn, fqdn: application.fqdn,
forceSave, forceSave,
dualCerts, dualCerts,
exposePort: application.exposePort exposePort: application.exposePort
})); });
for (const service of dockerComposeServices) {
if (dockerComposeConfiguration[service.name].fqdn) {
await post(`/applications/${id}/check`, {
fqdn: dockerComposeConfiguration[service.name].fqdn,
forceSave,
dualCerts,
exposePort: application.exposePort
});
}
}
}
await post(`/applications/${id}`, { await post(`/applications/${id}`, {
...application, ...application,
baseDatabaseBranch, baseDatabaseBranch,