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

fixes

Browse Source
This commit is contained in:
Andras Bacsai 2022-10-27 19:21:33 +00:00
parent 0f3b7fe643
commit 55cb788380
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/api/devTemplates.yaml
View File

@ -1929,6 +1929,7 @@
- $$id-postgresql - $$id-postgresql
environment: environment:
- BASE_URL=$$config_base_url - BASE_URL=$$config_base_url
- DATABASE_URL=$$secret_database_url
- JWT_SECRET=$$secret_jwt_secret - JWT_SECRET=$$secret_jwt_secret
- EMAIL_NOREPLY=$$config_email_noreply - EMAIL_NOREPLY=$$config_email_noreply
- EMAIL_MAILGUN_API=$$secret_email_mailgun_api - EMAIL_MAILGUN_API=$$secret_email_mailgun_api

6
apps/api/src/lib/services/handlers.ts
View File

@ -35,7 +35,7 @@ export async function startService(request: FastifyRequest<ServiceStartStop>) {
const teamId = request.user.teamId; const teamId = request.user.teamId;
const service = await getServiceFromDB({ id, teamId }); const service = await getServiceFromDB({ id, teamId });
const arm = isARM(service.arch) const arm = isARM(service.arch)
const { type, destinationDockerId, destinationDocker, persistentStorage } = const { type, destinationDockerId, destinationDocker, persistentStorage, exposePort } =
service; service;
const { workdir } = await createDirectories({ repository: type, buildId: id }); const { workdir } = await createDirectories({ repository: type, buildId: id });
@ -80,7 +80,7 @@ export async function startService(request: FastifyRequest<ServiceStartStop>) {
if (customVolumes.length > 0) { if (customVolumes.length > 0) {
for (const customVolume of customVolumes) { for (const customVolume of customVolumes) {
const { volumeName, path, containerId } = customVolume const { volumeName, path, containerId } = customVolume
if (!volumes.includes(`${volumeName}:${path}`) && containerId === service) { if (volumes && volumes.length > 0 && !volumes.includes(`${volumeName}:${path}`) && containerId === service) {
volumes.push(`${volumeName}:${path}`) volumes.push(`${volumeName}:${path}`)
} }
} }
@ -92,7 +92,7 @@ export async function startService(request: FastifyRequest<ServiceStartStop>) {
entrypoint: template.services[service]?.entrypoint, entrypoint: template.services[service]?.entrypoint,
image: arm ? template.services[service].imageArm : template.services[service].image, image: arm ? template.services[service].imageArm : template.services[service].image,
expose: template.services[service].ports, expose: template.services[service].ports,
// ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), ...(exposePort ? { ports: [`${exposePort}:${exposePort}`] } : {}),
volumes, volumes,
environment: newEnvironments, environment: newEnvironments,
depends_on: template.services[service]?.depends_on, depends_on: template.services[service]?.depends_on,

2
apps/api/templates.json
View File

File diff suppressed because one or more lines are too long

2
apps/ui/src/tailwind.css
View File

@ -88,7 +88,7 @@ label {
@apply inline-block; @apply inline-block;
} }
.btn { .btn {
@apply text-white text-base min-w-fit; @apply text-white text-base min-w-fit no-animation;
} }
a { a {