Skip to content

chore(sync): integrate Dokploy canary through e0c8d80 - #43

Merged
Bl4ckBl1zZ merged 13 commits into
mainfrom
automation/dokploy-upstream-sync
Oct 18, 2026
Merged

Bl4ckBl1zZ merged 13 commits into
mainfrom
automation/dokploy-upstream-sync

Conversation

@Bl4ckBl1zZ

@Bl4ckBl1zZ Bl4ckBl1zZ commented Oct 18, 2026 •

Copy link
Copy Markdown
Owner

What is this PR about?

This PR integrates Dokploy upstream canary through e0c8d80cd (2026-10-17). The fork last synced at 53464e909 in #42, so the range is 53464e909..e0c8d80cd: 12 commits across 4 upstream PRs.

Upstream changes:

Integration review

I resolved 9 conflicts by hand:

  • Service page headers (application, compose, postgres, mysql, mariadb, mongo, redis, libsql): kept the fork's responsive header, which stacks vertically on mobile (flex-col gap-3 sm:flex-row sm:justify-between sm:items-start), and added upstream's min-w-0/flex-1/truncate overflow fixes.
    • Upstream caps the server-badge column at max-w-[45%], which assumes the single-row layout. The fork stacks the header on mobile, so I apply the cap only from sm up and leave the column at max-w-full below that.
  • Breadcrumb: kept the fork's shared BREADCRUMB_LABEL_CLASS and added upstream's new title tooltip on the project label.

Fork behavior checked:

  • Removed license gating: no hasValidLicense, isEnterpriseCloud or licenseKey references outside tests. The billing page change is only the Stripe guard.
  • pipeBetweenServers fix from chore(sync): integrate Dokploy canary through 53464e9 #42: still present in remoteStream.ts; this range doesn't touch it.
  • Unchanged areas: Cloudflare, Tailscale, Halifax CI, the GHCR publish/release workflows, self-update and versioning are not touched. The app version stays 0.44.0.

No Product Overview changes are needed in CLAUDE.md; these are fixes only.

Migrations, dependencies, environment

  • Migrations: none. Two migration:generate runs both reported "No schema changes".
  • Dependencies: none changed. pnpm install --frozen-lockfile passes.
  • Environment: no new variables. NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY is now optional on the client.
  • OpenAPI: unchanged, since no routers changed.

Verification (local)

  • pnpm install --frozen-lockfile: pass
  • Migration generation twice: no changes, no drift
  • pnpm run format-and-lint: pass (0 errors)
  • Typecheck (pnpm run typecheck --checkers 2) for packages/server, apps/dokploy, apps/api and apps/schedules: pass
  • Vitest: 1344 passed, 11 skipped, 4 failed. The 4 are application.real.test.ts REAL deployment tests. They need docker build / nixpacks build, and this machine has neither binary. These are infra-only failures, the same as in chore(sync): integrate Dokploy canary through 5df820a #38–chore(sync): integrate Dokploy canary through 53464e9 #42; the hosted test job runs them.
  • Production build with an ephemeral BETTER_AUTH_SECRET (never printed or stored): pass

Hosted checks

On a3addbcea, pr-check (build), pr-check (test) and pr-check (typecheck) all pass on the first run. The hosted test job also runs the real Docker deployment tests that can't run locally.

Risk / rollout / rollback

Risk is low: small UI and notification fixes with no schema or dependency changes.

  • Rollout: deploy as usual. If Telegram notifications are configured, send a test notification.
  • Rollback: roll back the application image. There is no migration to reverse.

Checklist

  • You created a dedicated branch based on the canary branch. (This branch is based on the fork's main and integrates upstream canary.)
  • You have read the suggestions in the CONTRIBUTING.md file https://github.com/Dokploy/dokploy/blob/canary/CONTRIBUTING.md#pull-request
  • You have tested this PR in your local instance. (Automated checks and a production build ran locally; no live Dokploy instance was changed.)

Issues related (if applicable)

Not applicable for this upstream integration PR.

🤖 Generated with Claude Code

GlebsonS4ntos and others added 13 commits October 5, 2026 12:29
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
…f-hosted

fix(billing): guard loadStripe behind key check for self-hosted instances
…-escape-truncate

fix: escape HTML and truncate long messages in Telegram notifications
…e-header-overflow-mobile

fix(ui): prevent service header overflow on mobile
* fix: decode Route53 octal escapes in record names

* fix: keep escaped dots and backslashes in Route53 record names
Service page headers keep the fork's stacked mobile layout with upstream's
overflow fixes; the server badge column is capped at 45% only from sm up.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Oct 18, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 56ff469f-03aa-4003-a1c1-7138e677956b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@Bl4ckBl1zZ
Bl4ckBl1zZ marked this pull request as ready for review October 18, 2026 12:50
@Bl4ckBl1zZ
Bl4ckBl1zZ merged commit 50c0295 into main Oct 18, 2026
4 checks passed
@Bl4ckBl1zZ
Bl4ckBl1zZ deleted the automation/dokploy-upstream-sync branch October 18, 2026 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants