From a72281c0185a9fa594966b7953cc2ba1858036fb Mon Sep 17 00:00:00 2001 From: Mauricio Siu Date: Sat, 29 Nov 2025 01:07:22 -0600 Subject: [PATCH] refactor: enhance StopGracePeriod handling in database builders - Updated the condition for StopGracePeriod in various database builder files to check for null and undefined values, improving code robustness and clarity. --- packages/server/src/utils/builders/index.ts | 3 ++- packages/server/src/utils/databases/mariadb.ts | 3 ++- packages/server/src/utils/databases/mongo.ts | 3 ++- packages/server/src/utils/databases/mysql.ts | 3 ++- packages/server/src/utils/databases/postgres.ts | 3 ++- packages/server/src/utils/databases/redis.ts | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/server/src/utils/builders/index.ts b/packages/server/src/utils/builders/index.ts index 11912f6c5..a70e874c2 100644 --- a/packages/server/src/utils/builders/index.ts +++ b/packages/server/src/utils/builders/index.ts @@ -125,7 +125,8 @@ export const mechanizeDockerContainer = async ( Image: image, Env: envVariables, Mounts: [...volumesMount, ...bindsMount, ...filesMount], - ...(StopGracePeriod && { StopGracePeriod }), + ...(StopGracePeriod !== null && + StopGracePeriod !== undefined && { StopGracePeriod }), ...(command ? { Command: ["/bin/sh"], diff --git a/packages/server/src/utils/databases/mariadb.ts b/packages/server/src/utils/databases/mariadb.ts index 1db457018..852e174ef 100644 --- a/packages/server/src/utils/databases/mariadb.ts +++ b/packages/server/src/utils/databases/mariadb.ts @@ -73,7 +73,8 @@ export const buildMariadb = async (mariadb: MariadbNested) => { Image: dockerImage, Env: envVariables, Mounts: [...volumesMount, ...bindsMount, ...filesMount], - ...(StopGracePeriod && { StopGracePeriod }), + ...(StopGracePeriod !== null && + StopGracePeriod !== undefined && { StopGracePeriod }), ...(command ? { Command: ["/bin/sh"], diff --git a/packages/server/src/utils/databases/mongo.ts b/packages/server/src/utils/databases/mongo.ts index 3b71f323b..af5dc8cbd 100644 --- a/packages/server/src/utils/databases/mongo.ts +++ b/packages/server/src/utils/databases/mongo.ts @@ -121,7 +121,8 @@ ${command ?? "wait $MONGOD_PID"}`; Image: dockerImage, Env: envVariables, Mounts: [...volumesMount, ...bindsMount, ...filesMount], - ...(StopGracePeriod && { StopGracePeriod }), + ...(StopGracePeriod !== null && + StopGracePeriod !== undefined && { StopGracePeriod }), ...(replicaSets ? { Command: ["/bin/bash"], diff --git a/packages/server/src/utils/databases/mysql.ts b/packages/server/src/utils/databases/mysql.ts index 069803a7c..a1f75dd40 100644 --- a/packages/server/src/utils/databases/mysql.ts +++ b/packages/server/src/utils/databases/mysql.ts @@ -79,7 +79,8 @@ export const buildMysql = async (mysql: MysqlNested) => { Image: dockerImage, Env: envVariables, Mounts: [...volumesMount, ...bindsMount, ...filesMount], - ...(StopGracePeriod && { StopGracePeriod }), + ...(StopGracePeriod !== null && + StopGracePeriod !== undefined && { StopGracePeriod }), ...(command ? { Command: ["/bin/sh"], diff --git a/packages/server/src/utils/databases/postgres.ts b/packages/server/src/utils/databases/postgres.ts index afcd49ca1..e15f8a641 100644 --- a/packages/server/src/utils/databases/postgres.ts +++ b/packages/server/src/utils/databases/postgres.ts @@ -72,7 +72,8 @@ export const buildPostgres = async (postgres: PostgresNested) => { Image: dockerImage, Env: envVariables, Mounts: [...volumesMount, ...bindsMount, ...filesMount], - ...(StopGracePeriod && { StopGracePeriod }), + ...(StopGracePeriod !== null && + StopGracePeriod !== undefined && { StopGracePeriod }), ...(command ? { Command: ["/bin/sh"], diff --git a/packages/server/src/utils/databases/redis.ts b/packages/server/src/utils/databases/redis.ts index 7aa684565..2d9ae273d 100644 --- a/packages/server/src/utils/databases/redis.ts +++ b/packages/server/src/utils/databases/redis.ts @@ -70,7 +70,8 @@ export const buildRedis = async (redis: RedisNested) => { Image: dockerImage, Env: envVariables, Mounts: [...volumesMount, ...bindsMount, ...filesMount], - ...(StopGracePeriod && { StopGracePeriod }), + ...(StopGracePeriod !== null && + StopGracePeriod !== undefined && { StopGracePeriod }), Command: ["/bin/sh"], Args: [ "-c",