Merge pull request #853 from Dokploy/canary

v0.14.1
Dokploy · Dec 10, 2024 · 4628930 · 4628930
2 parents 7ecd162 + 0b3e15a
commit 4628930
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -99,14 +99,14 @@ workflows:
               only:
                 - main
                 - canary
-                - 379-preview-deployment
+                - fix/nixpacks-version
       - build-arm64:
           filters:
             branches:
               only:
                 - main
                 - canary
-                - 379-preview-deployment
+                - fix/nixpacks-version
       - combine-manifests:
           requires:
             - build-amd64
@@ -116,4 +116,4 @@ workflows:
               only:
                 - main
                 - canary
-                - 379-preview-deployment
+                - fix/nixpacks-version
diff --git a/Dockerfile b/Dockerfile
@@ -48,6 +48,8 @@ RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && rm
 
 # Install Nixpacks and tsx
 # | VERBOSE=1 VERSION=1.21.0 bash
+
+ARG NIXPACKS_VERSION=1.29.1
 RUN curl -sSL https://nixpacks.com/install.sh -o install.sh \
     && chmod +x install.sh \
     && ./install.sh \

diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.14.0",
+	"version": "v0.14.1",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",

diff --git a/packages/server/src/setup/server-setup.ts b/packages/server/src/setup/server-setup.ts
@@ -522,7 +522,8 @@ const installNixpacks = () => `
 	if command_exists nixpacks; then
 		echo "Nixpacks already installed ✅"
 	else
-		VERSION=1.28.1 bash -c "$(curl -fsSL https://nixpacks.com/install.sh)"
+	    export NIXPACKS_VERSION=1.29.1
+        bash -c "$(curl -fsSL https://nixpacks.com/install.sh)"
 		echo "Nixpacks version 1.28.1 installed ✅"
 	fi
 `;

diff --git a/packages/server/src/utils/gpu-setup.ts b/packages/server/src/utils/gpu-setup.ts
@@ -303,7 +303,7 @@ const setupLocalServer = async (daemonConfig: any) => {
 	await fs.writeFile(configFile, JSON.stringify(daemonConfig, null, 2));
 
 	const setupCommands = [
-		`pkexec sh -c '
+		`sudo sh -c '
 			cp ${configFile} /etc/docker/daemon.json && 
 			mkdir -p /etc/nvidia-container-runtime && 
 			sed -i "/swarm-resource/d" /etc/nvidia-container-runtime/config.toml &&
@@ -314,7 +314,14 @@ const setupLocalServer = async (daemonConfig: any) => {
 		`rm ${configFile}`,
 	].join(" && ");
 
-	await execAsync(setupCommands);
+	try {
+		await execAsync(setupCommands);
+	} catch (error) {
+		console.error("Setup failed:", error);
+		throw new Error(
+			"Failed to configure GPU support. Please ensure you have sudo privileges and try again.",
+		);
+	}
 };
 
 const addGpuLabel = async (nodeId: string, serverId?: string) => {