Skip to content

Commit 0bf4e55

Browse files
authored
Merge pull request #1771 from LexiconAlex/build/update-nixpacks-to-1.35.0
Update Nixpacks to 1.35.0
2 parents cd4eed3 + 79d55d8 commit 0bf4e55

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ feat: add new feature
5252

5353
Before you start, please make the clone based on the `canary` branch, since the `main` branch is the source of truth and should always reflect the latest stable release, also the PRs will be merged to the `canary` branch.
5454

55-
We use Node v20.9.0 and recommend this specific version. If you have nvm installed, you can run `nvm install 20.9.0 && nvm use` in the root directory.
55+
We use Node v20.9.0 and recommend this specific version. If you have nvm installed, you can run `nvm install 20.9.0 && nvm use` in the root directory.
5656

5757
```bash
5858
git clone https://github.com/dokploy/dokploy.git
@@ -147,11 +147,9 @@ curl -sSL https://railpack.com/install.sh | sh
147147

148148
```bash
149149
# Install Buildpacks
150-
curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.32.1/pack-v0.32.1-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
150+
curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.35.0/pack-v0.35.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
151151
```
152152

153-
154-
155153
## Pull Request
156154

157155
- The `main` branch is the source of truth and should always reflect the latest stable release.
@@ -169,7 +167,6 @@ Thank you for your contribution!
169167

170168
To add a new template, go to `https://github.com/Dokploy/templates` repository and read the README.md file.
171169

172-
173170
### Recommendations
174171

175172
- Use the same name of the folder as the id of the template.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && rm
4949
# Install Nixpacks and tsx
5050
# | VERBOSE=1 VERSION=1.21.0 bash
5151

52-
ARG NIXPACKS_VERSION=1.29.1
52+
ARG NIXPACKS_VERSION=1.35.0
5353
RUN curl -sSL https://nixpacks.com/install.sh -o install.sh \
5454
&& chmod +x install.sh \
5555
&& ./install.sh \

apps/dokploy/components/layouts/user-nav.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ export const UserNav = () => {
133133
Servers
134134
</DropdownMenuItem>
135135
)}
136-
137-
138136
</>
139137
)}
140138
</DropdownMenuGroup>

packages/server/src/setup/server-setup.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ CURRENT_USER=$USER
7676
7777
echo "Installing requirements for: OS: $OS_TYPE"
7878
if [ $EUID != 0 ]; then
79-
echo "Please run this script as root or with sudo ❌"
79+
echo "Please run this script as root or with sudo ❌"
8080
exit
8181
fi
8282
@@ -263,7 +263,7 @@ const setupMainDirectory = () => `
263263
# Create the /etc/dokploy directory
264264
mkdir -p /etc/dokploy
265265
chmod 777 /etc/dokploy
266-
266+
267267
echo "Directory /etc/dokploy created ✅"
268268
fi
269269
`;
@@ -276,16 +276,16 @@ export const setupSwarm = () => `
276276
# Get IP address
277277
get_ip() {
278278
local ip=""
279-
279+
280280
# Try IPv4 with multiple services
281281
# First attempt: ifconfig.io
282282
ip=\$(curl -4s --connect-timeout 5 https://ifconfig.io 2>/dev/null)
283-
283+
284284
# Second attempt: icanhazip.com
285285
if [ -z "\$ip" ]; then
286286
ip=\$(curl -4s --connect-timeout 5 https://icanhazip.com 2>/dev/null)
287287
fi
288-
288+
289289
# Third attempt: ipecho.net
290290
if [ -z "\$ip" ]; then
291291
ip=\$(curl -4s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null)
@@ -295,12 +295,12 @@ export const setupSwarm = () => `
295295
if [ -z "\$ip" ]; then
296296
# Try IPv6 with ifconfig.io
297297
ip=\$(curl -6s --connect-timeout 5 https://ifconfig.io 2>/dev/null)
298-
298+
299299
# Try IPv6 with icanhazip.com
300300
if [ -z "\$ip" ]; then
301301
ip=\$(curl -6s --connect-timeout 5 https://icanhazip.com 2>/dev/null)
302302
fi
303-
303+
304304
# Try IPv6 with ipecho.net
305305
if [ -z "\$ip" ]; then
306306
ip=\$(curl -6s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null)
@@ -549,7 +549,7 @@ export const createTraefikInstance = () => {
549549
sleep 8
550550
echo "Traefik migrated to Standalone ✅"
551551
fi
552-
552+
553553
if docker inspect dokploy-traefik > /dev/null 2>&1; then
554554
echo "Traefik already exists ✅"
555555
else
@@ -577,7 +577,7 @@ const installNixpacks = () => `
577577
if command_exists nixpacks; then
578578
echo "Nixpacks already installed ✅"
579579
else
580-
export NIXPACKS_VERSION=1.29.1
580+
export NIXPACKS_VERSION=1.35.0
581581
bash -c "$(curl -fsSL https://nixpacks.com/install.sh)"
582582
echo "Nixpacks version $NIXPACKS_VERSION installed ✅"
583583
fi

0 commit comments

Comments
 (0)