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

wip: trpc

Browse Source
This commit is contained in:
Andras Bacsai 2023-01-12 16:50:17 +01:00
parent 8980598085
commit c651570e62
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/server/src/jobs/applicationBuildQueue.ts
View File

@ -572,8 +572,7 @@ import { defaultComposeConfiguration } from '../lib/docker';
deploymentType, deploymentType,
forceRebuild forceRebuild
}); });
} } else if (buildpacks[buildPack])
if (buildpacks[buildPack])
await buildpacks[buildPack]({ await buildpacks[buildPack]({
dockerId: destinationDocker.id, dockerId: destinationDocker.id,
network: destinationDocker.network, network: destinationDocker.network,

10
apps/server/src/trpc/routers/applications/index.ts
View File

@ -76,7 +76,7 @@ export const applicationsRouter = router({
} else { } else {
await prisma.application.deleteMany({ where: { id, teams: { some: { id: teamId } } } }); await prisma.application.deleteMany({ where: { id, teams: { some: { id: teamId } } } });
} }
return {} return {};
}), }),
restartPreview: privateProcedure restartPreview: privateProcedure
.input( .input(
@ -101,7 +101,7 @@ export const applicationsRouter = router({
buildPack, buildPack,
exposePort exposePort
} = application; } = application;
let envs = []; let envs = [];
if (secrets.length > 0) { if (secrets.length > 0) {
envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId, false, port)]; envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId, false, port)];
@ -136,7 +136,7 @@ export const applicationsRouter = router({
if (!imageFound) { if (!imageFound) {
throw { status: 500, message: 'Image not found, cannot restart application.' }; throw { status: 500, message: 'Image not found, cannot restart application.' };
} }
const volumes = const volumes =
persistentStorage?.map((storage) => { persistentStorage?.map((storage) => {
return `${applicationId}${storage.path.replace(/\//gi, '-')}:${ return `${applicationId}${storage.path.replace(/\//gi, '-')}:${
@ -1321,8 +1321,8 @@ export const applicationsRouter = router({
z.object({ z.object({
id: z.string(), id: z.string(),
forceRebuild: z.boolean().default(false), forceRebuild: z.boolean().default(false),
pullmergeRequestId: z.string().nullable(), pullmergeRequestId: z.string().nullable().optional(),
branch: z.string().nullable() branch: z.string().nullable().optional()
}) })
) )
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {