Merge pull request #853 from Dokploy/canary

v0.14.1
This commit is contained in:
Mauricio Siu
2024-12-10 02:51:45 -06:00
committed by GitHub
5 changed files with 17 additions and 7 deletions

View File

@@ -99,14 +99,14 @@ workflows:
only: only:
- main - main
- canary - canary
- 379-preview-deployment - fix/nixpacks-version
- build-arm64: - build-arm64:
filters: filters:
branches: branches:
only: only:
- main - main
- canary - canary
- 379-preview-deployment - fix/nixpacks-version
- combine-manifests: - combine-manifests:
requires: requires:
- build-amd64 - build-amd64
@@ -116,4 +116,4 @@ workflows:
only: only:
- main - main
- canary - canary
- 379-preview-deployment - fix/nixpacks-version

View File

@@ -48,6 +48,8 @@ RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && rm
# Install Nixpacks and tsx # Install Nixpacks and tsx
# | VERBOSE=1 VERSION=1.21.0 bash # | VERBOSE=1 VERSION=1.21.0 bash
ARG NIXPACKS_VERSION=1.29.1
RUN curl -sSL https://nixpacks.com/install.sh -o install.sh \ RUN curl -sSL https://nixpacks.com/install.sh -o install.sh \
&& chmod +x install.sh \ && chmod +x install.sh \
&& ./install.sh \ && ./install.sh \

View File

@@ -1,6 +1,6 @@
{ {
"name": "dokploy", "name": "dokploy",
"version": "v0.14.0", "version": "v0.14.1",
"private": true, "private": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"type": "module", "type": "module",

View File

@@ -522,7 +522,8 @@ const installNixpacks = () => `
if command_exists nixpacks; then if command_exists nixpacks; then
echo "Nixpacks already installed ✅" echo "Nixpacks already installed ✅"
else 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 ✅" echo "Nixpacks version 1.28.1 installed ✅"
fi fi
`; `;

View File

@@ -303,7 +303,7 @@ const setupLocalServer = async (daemonConfig: any) => {
await fs.writeFile(configFile, JSON.stringify(daemonConfig, null, 2)); await fs.writeFile(configFile, JSON.stringify(daemonConfig, null, 2));
const setupCommands = [ const setupCommands = [
`pkexec sh -c ' `sudo sh -c '
cp ${configFile} /etc/docker/daemon.json && cp ${configFile} /etc/docker/daemon.json &&
mkdir -p /etc/nvidia-container-runtime && mkdir -p /etc/nvidia-container-runtime &&
sed -i "/swarm-resource/d" /etc/nvidia-container-runtime/config.toml && sed -i "/swarm-resource/d" /etc/nvidia-container-runtime/config.toml &&
@@ -314,7 +314,14 @@ const setupLocalServer = async (daemonConfig: any) => {
`rm ${configFile}`, `rm ${configFile}`,
].join(" && "); ].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) => { const addGpuLabel = async (nodeId: string, serverId?: string) => {