Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-06-19 22:25:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply stop grace period within container spec

Browse Source
This commit is contained in:
Lucas Manchine
2025-11-20 16:15:52 -03:00
parent a5abd46386
commit 1c652477fb
7 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/dokploy/__test__/server/mechanizeDockerContainer.test.ts
View File

@@ -4,7 +4,11 @@ import type { ApplicationNested } from "@dokploy/server/utils/builders";
import { mechanizeDockerContainer } from "@dokploy/server/utils/builders";
type MockCreateServiceOptions = {
StopGracePeriod?: number;
TaskTemplate?: {
ContainerSpec?: {
StopGracePeriod?: number;
};
};
[key: string]: unknown;
};
@@ -82,8 +86,10 @@ describe("mechanizeDockerContainer", () => {
throw new Error("createServiceMock should have been called once");
}
const [settings] = call;
expect(settings.StopGracePeriod).toBe(0);
expect(typeof settings.StopGracePeriod).toBe("number");
expect(settings.TaskTemplate?.ContainerSpec?.StopGracePeriod).toBe(0);
expect(typeof settings.TaskTemplate?.ContainerSpec?.StopGracePeriod).toBe(
"number",
);
});
it("omits StopGracePeriod when stopGracePeriodSwarm is null", async () => {
@@ -97,6 +103,8 @@ describe("mechanizeDockerContainer", () => {
throw new Error("createServiceMock should have been called once");
}
const [settings] = call;
expect(settings).not.toHaveProperty("StopGracePeriod");
expect(settings.TaskTemplate?.ContainerSpec).not.toHaveProperty(
"StopGracePeriod",
);
});
});

4
packages/server/src/utils/builders/index.ts
View File

@@ -125,6 +125,8 @@ export const mechanizeDockerContainer = async (
Image: image,
Env: envVariables,
Mounts: [...volumesMount, ...bindsMount, ...filesMount],
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
...(command
? {
Command: ["/bin/sh"],
@@ -153,8 +155,6 @@ export const mechanizeDockerContainer = async (
})),
},
UpdateConfig,
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
};
try {

4
packages/server/src/utils/databases/mariadb.ts
View File

@@ -73,6 +73,8 @@ export const buildMariadb = async (mariadb: MariadbNested) => {
Image: dockerImage,
Env: envVariables,
Mounts: [...volumesMount, ...bindsMount, ...filesMount],
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
...(command
? {
Command: ["/bin/sh"],
@@ -106,8 +108,6 @@ export const buildMariadb = async (mariadb: MariadbNested) => {
: [],
},
UpdateConfig,
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
};
try {
const service = docker.getService(appName);

4
packages/server/src/utils/databases/mongo.ts
View File

@@ -121,6 +121,8 @@ ${command ?? "wait $MONGOD_PID"}`;
Image: dockerImage,
Env: envVariables,
Mounts: [...volumesMount, ...bindsMount, ...filesMount],
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
...(replicaSets
? {
Command: ["/bin/bash"],
@@ -159,8 +161,6 @@ ${command ?? "wait $MONGOD_PID"}`;
: [],
},
UpdateConfig,
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
};
try {

4
packages/server/src/utils/databases/mysql.ts
View File

@@ -79,6 +79,8 @@ export const buildMysql = async (mysql: MysqlNested) => {
Image: dockerImage,
Env: envVariables,
Mounts: [...volumesMount, ...bindsMount, ...filesMount],
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
...(command
? {
Command: ["/bin/sh"],
@@ -112,8 +114,6 @@ export const buildMysql = async (mysql: MysqlNested) => {
: [],
},
UpdateConfig,
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
};
try {
const service = docker.getService(appName);

4
packages/server/src/utils/databases/postgres.ts
View File

@@ -72,6 +72,8 @@ export const buildPostgres = async (postgres: PostgresNested) => {
Image: dockerImage,
Env: envVariables,
Mounts: [...volumesMount, ...bindsMount, ...filesMount],
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
...(command
? {
Command: ["/bin/sh"],
@@ -105,8 +107,6 @@ export const buildPostgres = async (postgres: PostgresNested) => {
: [],
},
UpdateConfig,
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
};
try {
const service = docker.getService(appName);

4
packages/server/src/utils/databases/redis.ts
View File

@@ -70,6 +70,8 @@ export const buildRedis = async (redis: RedisNested) => {
Image: dockerImage,
Env: envVariables,
Mounts: [...volumesMount, ...bindsMount, ...filesMount],
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
Command: ["/bin/sh"],
Args: [
"-c",
@@ -102,8 +104,6 @@ export const buildRedis = async (redis: RedisNested) => {
: [],
},
UpdateConfig,
...(StopGracePeriod !== undefined &&
StopGracePeriod !== null && { StopGracePeriod }),
};
try {