mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-21 19:38:47 +00:00
chore(dependencies): update semver to version 7.7.3 and add @types/semver to package.json files; refactor getUpdateData function to accept current version as a parameter
This commit is contained in:
@@ -153,9 +153,11 @@
|
|||||||
"xterm-addon-fit": "^0.8.0",
|
"xterm-addon-fit": "^0.8.0",
|
||||||
"yaml": "2.8.1",
|
"yaml": "2.8.1",
|
||||||
"zod": "^3.25.32",
|
"zod": "^3.25.32",
|
||||||
"zod-form-data": "^2.0.7"
|
"zod-form-data": "^2.0.7",
|
||||||
|
"semver": "7.7.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@types/semver": "7.7.1",
|
||||||
"@types/shell-quote": "^1.7.5",
|
"@types/shell-quote": "^1.7.5",
|
||||||
"@types/adm-zip": "^0.5.7",
|
"@types/adm-zip": "^0.5.7",
|
||||||
"@types/bcrypt": "5.0.2",
|
"@types/bcrypt": "5.0.2",
|
||||||
|
|||||||
@@ -399,7 +399,7 @@ export const settingsRouter = createTRPCRouter({
|
|||||||
return DEFAULT_UPDATE_DATA;
|
return DEFAULT_UPDATE_DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
return await getUpdateData();
|
return await getUpdateData(packageInfo.version);
|
||||||
}),
|
}),
|
||||||
updateServer: adminProcedure.mutation(async () => {
|
updateServer: adminProcedure.mutation(async () => {
|
||||||
if (IS_CLOUD) {
|
if (IS_CLOUD) {
|
||||||
|
|||||||
@@ -78,9 +78,11 @@
|
|||||||
"ssh2": "1.15.0",
|
"ssh2": "1.15.0",
|
||||||
"toml": "3.0.0",
|
"toml": "3.0.0",
|
||||||
"ws": "8.16.0",
|
"ws": "8.16.0",
|
||||||
"zod": "^3.25.32"
|
"zod": "^3.25.32",
|
||||||
|
"semver": "7.7.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@types/semver": "7.7.1",
|
||||||
"@types/adm-zip": "^0.5.7",
|
"@types/adm-zip": "^0.5.7",
|
||||||
"@types/bcrypt": "5.0.2",
|
"@types/bcrypt": "5.0.2",
|
||||||
"@types/dockerode": "3.3.23",
|
"@types/dockerode": "3.3.23",
|
||||||
|
|||||||
@@ -5,12 +5,12 @@ import {
|
|||||||
execAsync,
|
execAsync,
|
||||||
execAsyncRemote,
|
execAsyncRemote,
|
||||||
} from "@dokploy/server/utils/process/execAsync";
|
} from "@dokploy/server/utils/process/execAsync";
|
||||||
|
import semver from "semver";
|
||||||
import {
|
import {
|
||||||
initializeStandaloneTraefik,
|
initializeStandaloneTraefik,
|
||||||
initializeTraefikService,
|
initializeTraefikService,
|
||||||
type TraefikOptions,
|
type TraefikOptions,
|
||||||
} from "../setup/traefik-setup";
|
} from "../setup/traefik-setup";
|
||||||
|
|
||||||
export interface IUpdateData {
|
export interface IUpdateData {
|
||||||
latestVersion: string | null;
|
latestVersion: string | null;
|
||||||
updateAvailable: boolean;
|
updateAvailable: boolean;
|
||||||
@@ -55,56 +55,82 @@ export const getServiceImageDigest = async () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/** Returns latest version number and information whether server update is available by comparing current image's digest against digest for provided image tag via Docker hub API. */
|
/** Returns latest version number and information whether server update is available by comparing current image's digest against digest for provided image tag via Docker hub API. */
|
||||||
export const getUpdateData = async (): Promise<IUpdateData> => {
|
export const getUpdateData = async (
|
||||||
let currentDigest: string;
|
currentVersion: string,
|
||||||
|
): Promise<IUpdateData> => {
|
||||||
try {
|
try {
|
||||||
currentDigest = await getServiceImageDigest();
|
const baseUrl =
|
||||||
} catch (error) {
|
"https://hub.docker.com/v2/repositories/dokploy/dokploy/tags";
|
||||||
// TODO: Docker versions 29.0.0 change the way to get the service image digest, so we need to update this in the future we upgrade to that version.
|
let url: string | null = `${baseUrl}?page_size=100`;
|
||||||
return DEFAULT_UPDATE_DATA;
|
let allResults: { digest: string; name: string }[] = [];
|
||||||
}
|
|
||||||
|
|
||||||
const baseUrl = "https://hub.docker.com/v2/repositories/dokploy/dokploy/tags";
|
// Fetch all tags from Docker Hub
|
||||||
let url: string | null = `${baseUrl}?page_size=100`;
|
while (url) {
|
||||||
let allResults: { digest: string; name: string }[] = [];
|
const response = await fetch(url, {
|
||||||
while (url) {
|
method: "GET",
|
||||||
const response = await fetch(url, {
|
headers: { "Content-Type": "application/json" },
|
||||||
method: "GET",
|
});
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
});
|
|
||||||
|
|
||||||
const data = (await response.json()) as {
|
const data = (await response.json()) as {
|
||||||
next: string | null;
|
next: string | null;
|
||||||
results: { digest: string; name: string }[];
|
results: { digest: string; name: string }[];
|
||||||
};
|
};
|
||||||
|
|
||||||
allResults = allResults.concat(data.results);
|
allResults = allResults.concat(data.results);
|
||||||
url = data?.next;
|
url = data?.next;
|
||||||
}
|
}
|
||||||
|
|
||||||
const imageTag = getDokployImageTag();
|
const currentImageTag = getDokployImageTag();
|
||||||
const searchedDigest = allResults.find((t) => t.name === imageTag)?.digest;
|
|
||||||
|
|
||||||
if (!searchedDigest) {
|
// Special handling for canary and feature branches
|
||||||
return DEFAULT_UPDATE_DATA;
|
// For development versions (canary/feature), don't perform update checks
|
||||||
}
|
// These are unstable versions that change frequently, and users on these
|
||||||
|
// branches are expected to manually manage updates
|
||||||
|
if (currentImageTag === "canary" || currentImageTag === "feature") {
|
||||||
|
return {
|
||||||
|
latestVersion: currentImageTag,
|
||||||
|
updateAvailable: false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
if (imageTag === "latest") {
|
// For stable versions, use semver comparison
|
||||||
const versionedTag = allResults.find(
|
// Find the "latest" tag and get its digest
|
||||||
(t) => t.digest === searchedDigest && t.name.startsWith("v"),
|
const latestTag = allResults.find((t) => t.name === "latest");
|
||||||
);
|
|
||||||
|
|
||||||
if (!versionedTag) {
|
if (!latestTag) {
|
||||||
return DEFAULT_UPDATE_DATA;
|
return DEFAULT_UPDATE_DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { name: latestVersion, digest } = versionedTag;
|
// Find the versioned tag (v0.x.x) that has the same digest as "latest"
|
||||||
const updateAvailable = digest !== currentDigest;
|
const latestVersionTag = allResults.find(
|
||||||
|
(t) => t.digest === latestTag.digest && t.name.startsWith("v"),
|
||||||
|
);
|
||||||
|
|
||||||
return { latestVersion, updateAvailable };
|
if (!latestVersionTag) {
|
||||||
|
return DEFAULT_UPDATE_DATA;
|
||||||
|
}
|
||||||
|
|
||||||
|
const latestVersion = latestVersionTag.name;
|
||||||
|
|
||||||
|
// Use semver to compare versions for stable releases
|
||||||
|
const cleanedCurrent = semver.clean(currentVersion);
|
||||||
|
const cleanedLatest = semver.clean(latestVersion);
|
||||||
|
|
||||||
|
if (!cleanedCurrent || !cleanedLatest) {
|
||||||
|
return DEFAULT_UPDATE_DATA;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if the latest version is greater than the current version
|
||||||
|
const updateAvailable = semver.gt(cleanedLatest, cleanedCurrent);
|
||||||
|
|
||||||
|
return {
|
||||||
|
latestVersion,
|
||||||
|
updateAvailable,
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error fetching update data:", error);
|
||||||
|
return DEFAULT_UPDATE_DATA;
|
||||||
}
|
}
|
||||||
const updateAvailable = searchedDigest !== currentDigest;
|
|
||||||
return { latestVersion: imageTag, updateAvailable };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
interface TreeDataItem {
|
interface TreeDataItem {
|
||||||
|
|||||||
Generated
+27
-18
@@ -400,6 +400,9 @@ importers:
|
|||||||
recharts:
|
recharts:
|
||||||
specifier: ^2.15.3
|
specifier: ^2.15.3
|
||||||
version: 2.15.3([email protected]([email protected]))([email protected])
|
version: 2.15.3([email protected]([email protected]))([email protected])
|
||||||
|
semver:
|
||||||
|
specifier: 7.7.3
|
||||||
|
version: 7.7.3
|
||||||
shell-quote:
|
shell-quote:
|
||||||
specifier: ^1.8.1
|
specifier: ^1.8.1
|
||||||
version: 1.8.2
|
version: 1.8.2
|
||||||
@@ -485,6 +488,9 @@ importers:
|
|||||||
'@types/react-dom':
|
'@types/react-dom':
|
||||||
specifier: 18.3.0
|
specifier: 18.3.0
|
||||||
version: 18.3.0
|
version: 18.3.0
|
||||||
|
'@types/semver':
|
||||||
|
specifier: 7.7.1
|
||||||
|
version: 7.7.1
|
||||||
'@types/shell-quote':
|
'@types/shell-quote':
|
||||||
specifier: ^1.7.5
|
specifier: ^1.7.5
|
||||||
version: 1.7.5
|
version: 1.7.5
|
||||||
@@ -717,6 +723,9 @@ importers:
|
|||||||
react-dom:
|
react-dom:
|
||||||
specifier: 18.2.0
|
specifier: 18.2.0
|
||||||
version: 18.2.0([email protected])
|
version: 18.2.0([email protected])
|
||||||
|
semver:
|
||||||
|
specifier: 7.7.3
|
||||||
|
version: 7.7.3
|
||||||
shell-quote:
|
shell-quote:
|
||||||
specifier: ^1.8.1
|
specifier: ^1.8.1
|
||||||
version: 1.8.2
|
version: 1.8.2
|
||||||
@@ -772,6 +781,9 @@ importers:
|
|||||||
'@types/react-dom':
|
'@types/react-dom':
|
||||||
specifier: 18.3.0
|
specifier: 18.3.0
|
||||||
version: 18.3.0
|
version: 18.3.0
|
||||||
|
'@types/semver':
|
||||||
|
specifier: 7.7.1
|
||||||
|
version: 7.7.1
|
||||||
'@types/shell-quote':
|
'@types/shell-quote':
|
||||||
specifier: ^1.7.5
|
specifier: ^1.7.5
|
||||||
version: 1.7.5
|
version: 1.7.5
|
||||||
@@ -4048,6 +4060,9 @@ packages:
|
|||||||
'@types/[email protected]':
|
'@types/[email protected]':
|
||||||
resolution: {integrity: sha512-eLgbR5KwUh8+6pngBDxS32MymdCsCHnGtwHTrC0GDorbc7NbcnkZAWptDLgZiRk9VRas+B6TyRgPDucq4zRs8g==}
|
resolution: {integrity: sha512-eLgbR5KwUh8+6pngBDxS32MymdCsCHnGtwHTrC0GDorbc7NbcnkZAWptDLgZiRk9VRas+B6TyRgPDucq4zRs8g==}
|
||||||
|
|
||||||
|
'@types/[email protected]':
|
||||||
|
resolution: {integrity: sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==}
|
||||||
|
|
||||||
'@types/[email protected]':
|
'@types/[email protected]':
|
||||||
resolution: {integrity: sha512-+UE8GAGRPbJVQDdxi16dgadcBfQ+KG2vgZhV1+3A1XmHbmwcdwhCUwIdy+d3pAGrbvgRoVSjeI9vOWyq376Yzw==}
|
resolution: {integrity: sha512-+UE8GAGRPbJVQDdxi16dgadcBfQ+KG2vgZhV1+3A1XmHbmwcdwhCUwIdy+d3pAGrbvgRoVSjeI9vOWyq376Yzw==}
|
||||||
|
|
||||||
@@ -7069,11 +7084,6 @@ packages:
|
|||||||
resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
|
resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
[email protected]:
|
|
||||||
resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
|
|
||||||
engines: {node: '>=10'}
|
|
||||||
hasBin: true
|
|
||||||
|
|
||||||
[email protected]:
|
[email protected]:
|
||||||
resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
|
resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
@@ -8101,7 +8111,7 @@ snapshots:
|
|||||||
'@commitlint/[email protected]':
|
'@commitlint/[email protected]':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@commitlint/types': 19.8.1
|
'@commitlint/types': 19.8.1
|
||||||
semver: 7.7.2
|
semver: 7.7.3
|
||||||
|
|
||||||
'@commitlint/[email protected]':
|
'@commitlint/[email protected]':
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -8718,7 +8728,7 @@ snapshots:
|
|||||||
nopt: 5.0.0
|
nopt: 5.0.0
|
||||||
npmlog: 5.0.1
|
npmlog: 5.0.1
|
||||||
rimraf: 3.0.2
|
rimraf: 3.0.2
|
||||||
semver: 7.7.2
|
semver: 7.7.3
|
||||||
tar: 6.2.1
|
tar: 6.2.1
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- encoding
|
- encoding
|
||||||
@@ -9309,7 +9319,7 @@ snapshots:
|
|||||||
'@opentelemetry/instrumentation': 0.57.2(@opentelemetry/[email protected])
|
'@opentelemetry/instrumentation': 0.57.2(@opentelemetry/[email protected])
|
||||||
'@opentelemetry/semantic-conventions': 1.28.0
|
'@opentelemetry/semantic-conventions': 1.28.0
|
||||||
forwarded-parse: 2.1.2
|
forwarded-parse: 2.1.2
|
||||||
semver: 7.7.2
|
semver: 7.7.3
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
@@ -9510,7 +9520,7 @@ snapshots:
|
|||||||
'@types/shimmer': 1.2.0
|
'@types/shimmer': 1.2.0
|
||||||
import-in-the-middle: 1.14.2
|
import-in-the-middle: 1.14.2
|
||||||
require-in-the-middle: 7.5.2
|
require-in-the-middle: 7.5.2
|
||||||
semver: 7.7.2
|
semver: 7.7.3
|
||||||
shimmer: 1.2.1
|
shimmer: 1.2.1
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
@@ -9655,7 +9665,7 @@ snapshots:
|
|||||||
'@opentelemetry/propagator-b3': 1.30.1(@opentelemetry/[email protected])
|
'@opentelemetry/propagator-b3': 1.30.1(@opentelemetry/[email protected])
|
||||||
'@opentelemetry/propagator-jaeger': 1.30.1(@opentelemetry/[email protected])
|
'@opentelemetry/propagator-jaeger': 1.30.1(@opentelemetry/[email protected])
|
||||||
'@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/[email protected])
|
'@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/[email protected])
|
||||||
semver: 7.7.2
|
semver: 7.7.3
|
||||||
|
|
||||||
'@opentelemetry/[email protected]': {}
|
'@opentelemetry/[email protected]': {}
|
||||||
|
|
||||||
@@ -11403,6 +11413,8 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 20.17.51
|
'@types/node': 20.17.51
|
||||||
|
|
||||||
|
'@types/[email protected]': {}
|
||||||
|
|
||||||
'@types/[email protected]': {}
|
'@types/[email protected]': {}
|
||||||
|
|
||||||
'@types/[email protected]': {}
|
'@types/[email protected]': {}
|
||||||
@@ -11802,7 +11814,7 @@ snapshots:
|
|||||||
lodash: 4.17.21
|
lodash: 4.17.21
|
||||||
msgpackr: 1.11.4
|
msgpackr: 1.11.4
|
||||||
node-abort-controller: 3.1.1
|
node-abort-controller: 3.1.1
|
||||||
semver: 7.7.2
|
semver: 7.7.3
|
||||||
tslib: 2.8.1
|
tslib: 2.8.1
|
||||||
uuid: 9.0.1
|
uuid: 9.0.1
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
@@ -12318,7 +12330,7 @@ snapshots:
|
|||||||
'@one-ini/wasm': 0.1.1
|
'@one-ini/wasm': 0.1.1
|
||||||
commander: 10.0.1
|
commander: 10.0.1
|
||||||
minimatch: 9.0.1
|
minimatch: 9.0.1
|
||||||
semver: 7.7.2
|
semver: 7.7.3
|
||||||
|
|
||||||
[email protected]: {}
|
[email protected]: {}
|
||||||
|
|
||||||
@@ -12632,7 +12644,7 @@ snapshots:
|
|||||||
'@petamoriken/float16': 3.9.2
|
'@petamoriken/float16': 3.9.2
|
||||||
debug: 4.4.1
|
debug: 4.4.1
|
||||||
env-paths: 3.0.0
|
env-paths: 3.0.0
|
||||||
semver: 7.7.2
|
semver: 7.7.3
|
||||||
shell-quote: 1.8.2
|
shell-quote: 1.8.2
|
||||||
which: 4.0.0
|
which: 4.0.0
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
@@ -13118,7 +13130,7 @@ snapshots:
|
|||||||
lodash.isstring: 4.0.1
|
lodash.isstring: 4.0.1
|
||||||
lodash.once: 4.1.1
|
lodash.once: 4.1.1
|
||||||
ms: 2.1.3
|
ms: 2.1.3
|
||||||
semver: 7.7.2
|
semver: 7.7.3
|
||||||
|
|
||||||
[email protected]:
|
[email protected]:
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -14650,10 +14662,7 @@ snapshots:
|
|||||||
|
|
||||||
[email protected]: {}
|
[email protected]: {}
|
||||||
|
|
||||||
[email protected].2: {}
|
[email protected].3: {}
|
||||||
|
|
||||||
[email protected]:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
[email protected]: {}
|
[email protected]: {}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user