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

View File

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

View File

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

File diff suppressed because one or more lines are too long

View File

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