[PR #981] [MERGED] fix: sync main into canary (unblocks the #980 release PR) #15307

New Issue

GiteaMirror · 2026-07-13T17:00:32-05:00

GiteaMirror commented

2026-07-13 17:00:32 -05:00

📋 Pull Request Information

Original PR: https://github.com/Dokploy/templates/pull/981
Author: @Siumauricio
Created: 7/8/2026
Status: ✅ Merged
Merged: 7/8/2026
Merged by: @Siumauricio

Base: canary ← Head: fix/sync-main-into-canary

📝 Commits (6)

5faf1b8 Update volume path in docker-compose.yml
d1ef07f New release (#975)
9708d34 Add SMTP_PORT environment variable to docker-compose (#806)
3f5b738 feat: add Velix API one-click template (#793)
cdee0c3 Merge pull request #726 from feba33/patch-1
54c2d66 Merge remote-tracking branch 'origin/main' into fix/sync-main-into-canary

📊 Changes

6 files changed (+98 additions, -2 deletions)

View changed files

📝 blueprints/anytype/docker-compose.yml (+1 -1)
📝 blueprints/typebot/docker-compose.yml (+3 -1)
➕ blueprints/velix-api/docker-compose.yml (+43 -0)
➕ blueprints/velix-api/meta.json (+19 -0)
➕ blueprints/velix-api/template.toml (+16 -0)
➕ blueprints/velix-api/velix-api.svg (+16 -0)

📄 Description

The release PR #980 (canary → main) is conflicting because main has 5 commits canary never received (the Velix API template #793, an SMTP_PORT fix #806, a volume-path fix, and older merge commits), and main still carries the pre-#978 root meta.json (modify/delete conflict).

This PR merges main into canary resolving everything:

Root meta.json: kept deleted (canary's per-template scheme is authoritative). Main's stale trmnl-byos-laravel entry dies with it — canary already has the renamed trmnl-larapaper.
blueprints/velix-api/ (main-only template) migrated to the new scheme: its entry extracted into blueprints/velix-api/meta.json, plus the missing required links.docs filled.
generate-meta.js --check passes across all 476 blueprints.

Once this merges, #980 will recompute as mergeable and the release can proceed.

🤖 Generated with Claude Code

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/Dokploy/templates/pull/981 **Author:** [@Siumauricio](https://github.com/Siumauricio) **Created:** 7/8/2026 **Status:** ✅ Merged **Merged:** 7/8/2026 **Merged by:** [@Siumauricio](https://github.com/Siumauricio) **Base:** `canary` ← **Head:** `fix/sync-main-into-canary` --- ### 📝 Commits (6) - [`5faf1b8`](https://github.com/Dokploy/templates/commit/5faf1b8579841e9526ef5ef6cfc9a143d3aefb00) Update volume path in docker-compose.yml - [`d1ef07f`](https://github.com/Dokploy/templates/commit/d1ef07fbd24b91601734ca5d669788ad400a017e) New release (#975) - [`9708d34`](https://github.com/Dokploy/templates/commit/9708d34ce12fb4cb19f21da893bf4923b8dac517) Add SMTP_PORT environment variable to docker-compose (#806) - [`3f5b738`](https://github.com/Dokploy/templates/commit/3f5b738738b96815b41b1de5c40905824ff2c8b3) feat: add Velix API one-click template (#793) - [`cdee0c3`](https://github.com/Dokploy/templates/commit/cdee0c3e2b1132b011712f819ca5396c74e18c87) Merge pull request #726 from feba33/patch-1 - [`54c2d66`](https://github.com/Dokploy/templates/commit/54c2d66ef5c504db395a8f32e39059159a9e8fc5) Merge remote-tracking branch 'origin/main' into fix/sync-main-into-canary ### 📊 Changes **6 files changed** (+98 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `blueprints/anytype/docker-compose.yml` (+1 -1) 📝 `blueprints/typebot/docker-compose.yml` (+3 -1) ➕ `blueprints/velix-api/docker-compose.yml` (+43 -0) ➕ `blueprints/velix-api/meta.json` (+19 -0) ➕ `blueprints/velix-api/template.toml` (+16 -0) ➕ `blueprints/velix-api/velix-api.svg` (+16 -0) </details> ### 📄 Description The release PR #980 (canary → main) is conflicting because main has 5 commits canary never received (the Velix API template #793, an SMTP_PORT fix #806, a volume-path fix, and older merge commits), and main still carries the pre-#978 root `meta.json` (modify/delete conflict). This PR merges `main` into `canary` resolving everything: - Root `meta.json`: kept deleted (canary's per-template scheme is authoritative). Main's stale `trmnl-byos-laravel` entry dies with it — canary already has the renamed `trmnl-larapaper`. - `blueprints/velix-api/` (main-only template) migrated to the new scheme: its entry extracted into `blueprints/velix-api/meta.json`, plus the missing required `links.docs` filled. - `generate-meta.js --check` passes across all 476 blueprints. Once this merges, #980 will recompute as mergeable and the release can proceed. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

GiteaMirror added the pull-request label 2026-07-13 17:00:32 -05:00

GiteaMirror closed this issue

2026-07-13 17:00:34 -05:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/templates#15307