gsadmin/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-10-21 16:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge canary and regenerate the migration at a free number

Browse Source 
canary landed its own 0190 (0190_nappy_anita_blake), which collides with this
branch's 0190_even_mastermind. Renaming would not have been enough: drizzle
applies migrations by comparing timestamps against the last applied one, so this
branch's older `when` would have been silently skipped on any deployment that
had already run canary's 0190, leaving the enum without its new value.

Regenerated as 0191_elite_ultragirl with a current timestamp.
This commit is contained in:
Guillaume Juge
2026-09-02 08:58:09 +02:00
parent f83097b80f 344febb4c1
commit 4746cfc1ca
44 changed files with 11673 additions and 1369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/utils/builders/docker-file.ts
+1 -5
View File
@@ -26,11 +26,7 @@ export const getDockerCommand = (application: ApplicationNested) => {
try {
const image = `${appName}`;
const defaultContextPath =
dockerFilePath.substring(0, dockerFilePath.lastIndexOf("/") + 1) || ".";
const dockerContextPath =
getDockerContextPath(application) || defaultContextPath;
const dockerContextPath = getDockerContextPath(application);
const commandArgs = ["build", "-t", image, "-f", dockerFilePath, "."];
packages/server/src/utils/filesystem/directory.ts
+6 -4
View File
@@ -138,8 +138,10 @@ export const getDockerContextPath = (application: Application) => {
const { APPLICATIONS_PATH } = paths(!!application.serverId);
const { appName, dockerContextPath } = application;
if (!dockerContextPath) {
return null;
}
return path.join(APPLICATIONS_PATH, appName, "code", dockerContextPath);
return path.join(
APPLICATIONS_PATH,
appName,
"code",
dockerContextPath || ".",
);
};