Skip to content

Commit 87c7305

Browse files
committed
Merge branch 'canary' into invite-user-with-initial-credentials
2 parents 864e229 + 31fdf69 commit 87c7305

578 files changed

Lines changed: 227349 additions & 30240 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dockerfile for DevContainer
2-
FROM node:20.16.0-bullseye-slim
2+
FROM node:24.4.0-bullseye-slim
33

44
# Install essential packages
55
RUN apt-get update && apt-get install -y \
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
1212
# Set up PNPM
1313
ENV PNPM_HOME="/pnpm"
1414
ENV PATH="$PNPM_HOME:$PATH"
15-
RUN corepack enable && corepack prepare pnpm@9.12.0 --activate
15+
RUN corepack enable && corepack prepare pnpm@10.22.0 --activate
1616

1717
# Create workspace directory
1818
WORKDIR /workspaces/dokploy

.github/workflows/deploy.yml

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,17 @@ jobs:
1313
- name: Checkout repository
1414
uses: actions/checkout@v3
1515

16+
- name: Set tag and version
17+
id: meta-cloud
18+
run: |
19+
VERSION=$(jq -r .version apps/dokploy/package.json)
20+
echo "version=$VERSION" >> $GITHUB_OUTPUT
21+
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
22+
echo "tags=siumauricio/cloud:latest,siumauricio/cloud:${VERSION}" >> $GITHUB_OUTPUT
23+
else
24+
echo "tags=siumauricio/cloud:canary" >> $GITHUB_OUTPUT
25+
fi
26+
1627
- name: Log in to Docker Hub
1728
uses: docker/login-action@v2
1829
with:
@@ -25,8 +36,7 @@ jobs:
2536
context: .
2637
file: ./Dockerfile.cloud
2738
push: true
28-
tags: |
29-
siumauricio/cloud:${{ github.ref_name == 'main' && 'latest' || 'canary' }}
39+
tags: ${{ steps.meta-cloud.outputs.tags }}
3040
platforms: linux/amd64
3141
build-args: |
3242
NEXT_PUBLIC_UMAMI_HOST=${{ secrets.NEXT_PUBLIC_UMAMI_HOST }}
@@ -40,6 +50,16 @@ jobs:
4050
- name: Checkout repository
4151
uses: actions/checkout@v3
4252

53+
- name: Set tag and version
54+
id: meta-schedule
55+
run: |
56+
VERSION=$(jq -r .version apps/dokploy/package.json)
57+
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
58+
echo "tags=siumauricio/schedule:latest,siumauricio/schedule:${VERSION}" >> $GITHUB_OUTPUT
59+
else
60+
echo "tags=siumauricio/schedule:canary" >> $GITHUB_OUTPUT
61+
fi
62+
4363
- name: Log in to Docker Hub
4464
uses: docker/login-action@v2
4565
with:
@@ -52,8 +72,7 @@ jobs:
5272
context: .
5373
file: ./Dockerfile.schedule
5474
push: true
55-
tags: |
56-
siumauricio/schedule:${{ github.ref_name == 'main' && 'latest' || 'canary' }}
75+
tags: ${{ steps.meta-schedule.outputs.tags }}
5776
platforms: linux/amd64
5877

5978
build-and-push-server-image:
@@ -63,6 +82,16 @@ jobs:
6382
- name: Checkout repository
6483
uses: actions/checkout@v3
6584

85+
- name: Set tag and version
86+
id: meta-server
87+
run: |
88+
VERSION=$(jq -r .version apps/dokploy/package.json)
89+
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
90+
echo "tags=siumauricio/server:latest,siumauricio/server:${VERSION}" >> $GITHUB_OUTPUT
91+
else
92+
echo "tags=siumauricio/server:canary" >> $GITHUB_OUTPUT
93+
fi
94+
6695
- name: Log in to Docker Hub
6796
uses: docker/login-action@v2
6897
with:
@@ -75,6 +104,5 @@ jobs:
75104
context: .
76105
file: ./Dockerfile.server
77106
push: true
78-
tags: |
79-
siumauricio/server:${{ github.ref_name == 'main' && 'latest' || 'canary' }}
107+
tags: ${{ steps.meta-server.outputs.tags }}
80108
platforms: linux/amd64

.github/workflows/pr-quality.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ jobs:
1616
steps:
1717
- uses: peakoss/anti-slop@v0
1818
with:
19-
max-failures: 4
2019
blocked-commit-authors: "claude,copilot"
2120
require-description: true
2221
min-account-age: 5

.github/workflows/pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: pnpm/action-setup@v4
1919
- uses: actions/setup-node@v4
2020
with:
21-
node-version: 20.16.0
21+
node-version: 24.4.0
2222
cache: "pnpm"
2323

2424
- name: Install Nixpacks

.github/workflows/sync-openapi-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: pnpm/action-setup@v4
2525
- uses: actions/setup-node@v4
2626
with:
27-
node-version: 20.16.0
27+
node-version: 24.4.0
2828
cache: "pnpm"
2929

3030
- name: Install dependencies

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.16.0
1+
24.4.0

CONTRIBUTING.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ feat: add new feature
5353

5454
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.
5555

56-
We use Node v20.16.0 and recommend this specific version. If you have nvm installed, you can run `nvm install 20.16.0 && nvm use` in the root directory.
56+
We use Node v24.4.0 and recommend this specific version. If you have nvm installed, you can run `nvm install 24.4.0 && nvm use` in the root directory.
5757

5858
```bash
5959
git clone https://github.com/dokploy/dokploy.git
@@ -99,7 +99,14 @@ pnpm run dokploy:build
9999

100100
## Docker
101101

102-
To build the docker image
102+
To build the docker image first run commands to copy .env files
103+
104+
```bash
105+
cp apps/dokploy/.env.production.example .env.production
106+
cp apps/dokploy/.env.production.example apps/dokploy/.env.production
107+
```
108+
109+
then run build command
103110

104111
```bash
105112
pnpm run docker:build
@@ -165,10 +172,11 @@ curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.39.1/pack-v0.
165172

166173
### Important Considerations for Pull Requests
167174

168-
- **Testing is Mandatory:** All Pull Requests **must be tested** before submission. You must verify that your changes work as expected in a local development environment (see [Setup](#setup)). **Pull Requests that have not been tested will be closed.** This policy ensures clean contributions and reduces the time maintainers spend reviewing untested or broken code.
175+
- **Testing is Mandatory:** All Pull Requests **must be tested** by the PR author before submission. You must verify that your changes work as expected in a local development environment (see [Setup](#setup)). **Pull Requests that have not been tested by their creator will be rejected.** This policy keeps the PR history clean and values contributors who submit verified, working code. Untested PRs are often recognizable by disproportionately large or scattered changes for simple tasks—please test first.
169176
- **Focus and Scope:** Each Pull Request should ideally address a single, well-defined problem or introduce one new feature. This greatly facilitates review and reduces the chances of introducing unintended side effects.
170177
- **Avoid Unfocused Changes:** Please avoid submitting Pull Requests that contain only minor changes such as whitespace adjustments, IDE-generated formatting, or removal of unused variables, unless these are part of a larger, clearly defined refactor or a dedicated "cleanup" Pull Request that addresses a specific `good first issue` or maintenance task.
171178
- **Issue Association:** For any significant change, it's highly recommended to open an issue first to discuss the proposed solution with the community and maintainers. This ensures alignment and avoids duplicated effort. If your PR resolves an existing issue, please link it in the description (e.g., `Fixes #123`, `Closes #456`).
179+
- **Large Features:** Pull Requests that introduce very large or broad features **will not be accepted** unless the idea is first outlined and discussed in a GitHub issue. Large features should be designed together with the Dokploy team so the project stays coherent and moves in the same direction. Open an issue to propose and align on the design before implementing.
172180

173181
Thank you for your contribution!
174182

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# syntax=docker/dockerfile:1
2-
FROM node:20.16.0-slim AS base
2+
FROM node:24.4.0-slim AS base
33
ENV PNPM_HOME="/pnpm"
44
ENV PATH="$PNPM_HOME:$PATH"
55
RUN corepack enable
6-
RUN corepack prepare pnpm@9.12.0 --activate
6+
RUN corepack prepare pnpm@10.22.0 --activate
77

88
FROM base AS build
99
COPY . /usr/src/app
@@ -20,7 +20,7 @@ ENV NODE_ENV=production
2020
RUN pnpm --filter=@dokploy/server build
2121
RUN pnpm --filter=./apps/dokploy run build
2222

23-
RUN pnpm --filter=./apps/dokploy --prod deploy /prod/dokploy
23+
RUN pnpm --filter=./apps/dokploy --prod deploy --legacy /prod/dokploy
2424

2525
RUN cp -R /usr/src/app/apps/dokploy/.next /prod/dokploy/.next
2626
RUN cp -R /usr/src/app/apps/dokploy/dist /prod/dokploy/dist

Dockerfile.cloud

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# syntax=docker/dockerfile:1
2-
FROM node:20.16.0-slim AS base
2+
FROM node:24.4.0-slim AS base
33
ENV PNPM_HOME="/pnpm"
44
ENV PATH="$PNPM_HOME:$PATH"
55
RUN corepack enable
6-
RUN corepack prepare pnpm@9.12.0 --activate
6+
RUN corepack prepare pnpm@10.22.0 --activate
77

88
FROM base AS build
99
COPY . /usr/src/app
@@ -29,7 +29,7 @@ ENV NODE_ENV=production
2929
RUN pnpm --filter=@dokploy/server build
3030
RUN pnpm --filter=./apps/dokploy run build
3131

32-
RUN pnpm --filter=./apps/dokploy --prod deploy /prod/dokploy
32+
RUN pnpm --filter=./apps/dokploy --prod deploy --legacy /prod/dokploy
3333

3434
RUN cp -R /usr/src/app/apps/dokploy/.next /prod/dokploy/.next
3535
RUN cp -R /usr/src/app/apps/dokploy/dist /prod/dokploy/dist

Dockerfile.schedule

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# syntax=docker/dockerfile:1
2-
FROM node:20.16.0-slim AS base
2+
FROM node:24.4.0-slim AS base
33
ENV PNPM_HOME="/pnpm"
44
ENV PATH="$PNPM_HOME:$PATH"
55
RUN corepack enable
6-
RUN corepack prepare pnpm@9.12.0 --activate
6+
RUN corepack prepare pnpm@10.22.0 --activate
77

88
FROM base AS build
99
COPY . /usr/src/app
@@ -20,7 +20,7 @@ ENV NODE_ENV=production
2020
RUN pnpm --filter=@dokploy/server build
2121
RUN pnpm --filter=./apps/schedules run build
2222

23-
RUN pnpm --filter=./apps/schedules --prod deploy /prod/schedules
23+
RUN pnpm --filter=./apps/schedules --prod deploy --legacy /prod/schedules
2424

2525
RUN cp -R /usr/src/app/apps/schedules/dist /prod/schedules/dist
2626

0 commit comments

Comments
 (0)