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

fix: heroku bp

Browse Source
This commit is contained in:
Andras Bacsai
2022-11-02 15:36:23 +01:00
parent 2e713b459e
commit f863b42b71
7 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -480,7 +480,6 @@ export const saveBuildLog = async ({
}
})
} catch (error) {
if (isDev) return
return await prisma.buildLog.create({
data: {
line: addTimestamp, buildId, time: Number(day().valueOf()), applicationId

5
apps/api/src/lib/buildPacks/heroku.ts
View File

@@ -2,13 +2,14 @@ import { executeDockerCmd, prisma } from "../common"
import { saveBuildLog } from "./common";
export default async function (data: any): Promise<void> {
const { buildId, applicationId, tag, dockerId, debug, workdir, baseDirectory } = data
const { buildId, applicationId, tag, dockerId, debug, workdir, baseDirectory, baseImage } = data
try {
await saveBuildLog({ line: `Building image started.`, buildId, applicationId });
await executeDockerCmd({
buildId,
debug,
dockerId,
command: `pack build -p ${workdir}${baseDirectory} ${applicationId}:${tag} --builder heroku/buildpacks:20`
command: `pack build -p ${workdir}${baseDirectory} ${applicationId}:${tag} --builder ${baseImage}`
})
await saveBuildLog({ line: `Building image successful.`, buildId, applicationId });
} catch (error) {

48
apps/api/src/routes/webhooks/traefik/handlers.ts
View File

@@ -523,9 +523,7 @@ export async function traefikConfiguration(request, reply) {
}
}
}
return {
...traefik
}
const { fqdn, dualCerts } = await prisma.setting.findFirst();
if (fqdn) {
const domain = getDomain(fqdn);
@@ -546,30 +544,30 @@ export async function traefikConfiguration(request, reply) {
for (const application of data.applications) {
configureMiddleware(application, traefik);
}
for (const service of data.services) {
const { id, scriptName } = service;
// for (const service of data.services) {
// const { id, scriptName } = service;
configureMiddleware(service, traefik);
if (service.type === 'minio') {
service.id = id + '-minio';
service.container = id;
service.domain = service.otherDomain;
service.nakedDomain = service.otherNakedDomain;
service.isHttps = service.otherIsHttps;
service.isWWW = service.otherIsWWW;
service.port = 9000;
configureMiddleware(service, traefik);
}
// configureMiddleware(service, traefik);
// if (service.type === 'minio') {
// service.id = id + '-minio';
// service.container = id;
// service.domain = service.otherDomain;
// service.nakedDomain = service.otherNakedDomain;
// service.isHttps = service.otherIsHttps;
// service.isWWW = service.otherIsWWW;
// service.port = 9000;
// configureMiddleware(service, traefik);
// }
if (scriptName) {
traefik.http.middlewares[`${id}-redir`] = {
replacepathregex: {
regex: `/js/${scriptName}`,
replacement: '/js/plausible.js'
}
};
}
}
// if (scriptName) {
// traefik.http.middlewares[`${id}-redir`] = {
// replacepathregex: {
// regex: `/js/${scriptName}`,
// replacement: '/js/plausible.js'
// }
// };
// }
// }
for (const coolify of data.coolify) {
configureMiddleware(coolify, traefik);
}