gsadmin/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-10-20 15:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,982 Commits 209 Branches 176 Tags
b5c3d8660ecaea1c7d928362df29e7e018a1cd85
Commit Graph

3 Commits

Author SHA1 Message Date
Mauricio Siu 1b9504897a Merge branch 'main' into canary 
Resolve conflicts in docker.ts and domain.ts: canary already contains
a superset of main's hotfix cherry-picks (isDockerDesktop, isolated
network label pinning), just refactored/reformatted, so both sides
kept canary's version.

Also fix hotfix-cherry-pick.yml to sync each cherry-pick back into
canary immediately, so canary and main share history for that change
and the next canary->main release PR doesn't re-conflict on it.
 2026-08-14 00:47:41 -06:00
Mauricio Siu 06b67d4519 fix(ci): push hotfix cherry-picks with PAT to satisfy branch rules 2026-08-06 00:26:52 -06:00
Mauricio Siu 2f8af90da4 feat(ci): add hotfix cherry-pick and release workflows 2026-08-05 23:34:01 -06:00