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

fix: publishDirectory

Browse Source
This commit is contained in:
Andras Bacsai
2023-03-04 15:06:35 +01:00
parent d2329360d0
commit 87da27f9bf
12 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/api/src/jobs/deployApplication.ts
View File

@@ -386,7 +386,7 @@ import * as buildpacks from '../lib/buildPacks';
try {
dockerComposeConfiguration = JSON.parse(dockerComposeConfiguration);
} catch (error) {}
} catch (error) { }
let deployNeeded = true;
let destinationType;
@@ -453,7 +453,7 @@ import * as buildpacks from '../lib/buildPacks';
try {
await prisma.build.update({ where: { id: buildId }, data: { commit } });
} catch (err) {}
} catch (err) { }
if (!pullmergeRequestId) {
if (configHash !== currentHash) {
@@ -494,9 +494,8 @@ import * as buildpacks from '../lib/buildPacks';
try {
await executeCommand({
dockerId: destinationDocker.id,
command: `docker ${
location ? `--config ${location}` : ''
} pull ${imageName}:${customTag}`
command: `docker ${location ? `--config ${location}` : ''
} pull ${imageName}:${customTag}`
});
imageFoundRemotely = true;
} catch (error) {
@@ -659,9 +658,8 @@ import * as buildpacks from '../lib/buildPacks';
try {
const { stdout: containers } = await executeCommand({
dockerId: destinationDockerId,
command: `docker ps -a --filter 'label=com.docker.compose.service=${
pullmergeRequestId ? imageId : applicationId
}' --format {{.ID}}`
command: `docker ps -a --filter 'label=com.docker.compose.service=${pullmergeRequestId ? imageId : applicationId
}' --format {{.ID}}`
});
if (containers) {
const containerArray = containers.split('\n');