@@ -3,17 +3,17 @@ import { findServerById } from "../services/server";
33
44export const validateDocker = ( ) => `
55 if command_exists docker; then
6- echo true
6+ echo "$(docker --version | awk '{print $3}' | sed 's/,//') true"
77 else
8- echo false
8+ echo "0.0.0 false"
99 fi
1010` ;
1111
1212export const validateRClone = ( ) => `
1313 if command_exists rclone; then
14- echo true
14+ echo "$(rclone --version | head -n 1 | awk '{print $2}') true"
1515 else
16- echo false
16+ echo "0.0.0 false"
1717 fi
1818` ;
1919
@@ -27,17 +27,17 @@ export const validateSwarm = () => `
2727
2828export const validateNixpacks = ( ) => `
2929 if command_exists nixpacks; then
30- echo true
30+ echo "$(nixpacks --version | awk '{print $2}') true"
3131 else
32- echo false
32+ echo "0.0.0 false"
3333 fi
3434` ;
3535
3636export const validateBuildpacks = ( ) => `
3737 if command_exists pack; then
38- echo true
38+ echo "$(pack --version | awk '{print $1}') true"
3939 else
40- echo false
40+ echo "0.0.0 false"
4141 fi
4242` ;
4343
@@ -48,6 +48,15 @@ export const validateMainDirectory = () => `
4848 echo false
4949 fi
5050` ;
51+
52+ export const validateDokployNetwork = ( ) => `
53+ if docker network ls | grep -q 'dokploy-network'; then
54+ echo true
55+ else
56+ echo false
57+ fi
58+ ` ;
59+
5160export const serverValidate = async ( serverId : string ) => {
5261 const client = new Client ( ) ;
5362 const server = await findServerById ( serverId ) ;
@@ -63,14 +72,28 @@ export const serverValidate = async (serverId: string) => {
6372 command -v "$@" > /dev/null 2>&1
6473 }
6574
66- isDockerInstalled=$(${ validateDocker ( ) } )
67- isRCloneInstalled=$(${ validateRClone ( ) } )
75+ dockerVersionEnabled=$(${ validateDocker ( ) } )
76+ rcloneVersionEnabled=$(${ validateRClone ( ) } )
77+ nixpacksVersionEnabled=$(${ validateNixpacks ( ) } )
78+ buildpacksVersionEnabled=$(${ validateBuildpacks ( ) } )
79+
80+ dockerVersion=$(echo $dockerVersionEnabled | awk '{print $1}')
81+ dockerEnabled=$(echo $dockerVersionEnabled | awk '{print $2}')
82+
83+ rcloneVersion=$(echo $rcloneVersionEnabled | awk '{print $1}')
84+ rcloneEnabled=$(echo $rcloneVersionEnabled | awk '{print $2}')
85+
86+ nixpacksVersion=$(echo $nixpacksVersionEnabled | awk '{print $1}')
87+ nixpacksEnabled=$(echo $nixpacksVersionEnabled | awk '{print $2}')
88+
89+ buildpacksVersion=$(echo $buildpacksVersionEnabled | awk '{print $1}')
90+ buildpacksEnabled=$(echo $buildpacksVersionEnabled | awk '{print $2}')
91+
92+ isDokployNetworkInstalled=$(${ validateDokployNetwork ( ) } )
6893 isSwarmInstalled=$(${ validateSwarm ( ) } )
69- isNixpacksInstalled=$(${ validateNixpacks ( ) } )
70- isBuildpacksInstalled=$(${ validateBuildpacks ( ) } )
71- isMainDirectoryInstalled=$(${ validateMainDirectory ( ) } )
94+ isMainDirectoryInstalled=$(${ validateMainDirectory ( ) } )
7295
73- echo "{\\"isDockerInstalled \\": $isDockerInstalled , \\"isRCloneInstalled \\": $isRCloneInstalled , \\"isSwarmInstalled \\": $isSwarmInstalled , \\"isNixpacksInstalled \\": $isNixpacksInstalled , \\"isBuildpacksInstalled \\": $isBuildpacksInstalled , \\"isMainDirectoryInstalled\\": $isMainDirectoryInstalled}"
96+ echo "{\\"docker \\": {\\"version\\": \\"$dockerVersion\\" , \\"enabled \\": $dockerEnabled} , \\"rclone \\": {\\"version\\": \\"$rcloneVersion\\" , \\"enabled \\": $rcloneEnabled} , \\"nixpacks \\": {\\"version\\": \\"$nixpacksVersion\\", \\"enabled\\": $nixpacksEnabled}, \\"buildpacks\\": {\\"version\\": \\"$buildpacksVersion\\", \\"enabled\\": $buildpacksEnabled}, \\"isDokployNetworkInstalled\\": $isDokployNetworkInstalled, \\"isSwarmInstalled\\": $isSwarmInstalled , \\"isMainDirectoryInstalled\\": $isMainDirectoryInstalled}"
7497 ` ;
7598 client . exec ( bashCommand , ( err , stream ) => {
7699 if ( err ) {
0 commit comments