feat(icon): enhance icon management for services - #4932
Merged
Conversation
- Updated ShowIconSettings component to handle both application and compose service types. - Added new icon column to the compose table in the database. - Implemented fetching and updating of icons for services in the environment and application pages. - Introduced fetchTemplateLogo function to retrieve logos for templates, improving icon handling for compose services.
dosubot
Bot
added
size:L
windinternet
added a commit
to windinternet/dokploy
that referenced
this pull request
Jul 29, 2026
…tatus column Upstream Dokploy#4932 (icon management) was developed on top of Dokploy#3774 (network management) which introduced a serviceNetworks jsonb column on the compose table. Since this branch did not pick Dokploy#3774, the serviceNetworks zod field in createSchema has no backing column and breaks drizzle's typed schema validation. Drop the field. Similarly, findEnvironmentsByProjectId was rewritten to include 'compose.applicationStatus', but the compose table only has 'composeStatus'. Drop the stale column reference.
windinternet
added a commit
to windinternet/dokploy
that referenced
this pull request
Jul 29, 2026
Brings in the upstream/canary HEAD (5df820a) as an ancestor of this branch using -s ours, matching the 2026-07-15 sync policy. The merge content is intentionally empty; this commit only records that every cherry-picked upstream commit has been reviewed and either integrated or explicitly rejected: - 32 security fixes (Dokploy#4855-Dokploy#4875): all integrated - 8 bug fixes (Dokploy#4626, Dokploy#4847, Dokploy#4876, Dokploy#4877, Dokploy#4911, Dokploy#4924, Dokploy#4929, Dokploy#4931): all integrated - 2 AI custom provider (Dokploy#4882): integrated - 1 icon management (Dokploy#4932): integrated with serviceNetworks stripped (Dokploy#3774 not picked) - SOS / Redis-removal / multi-language cleanup: rejected After this commit, GitHub will no longer list these upstream commits as 'ahead/behind' pending sync. Future upstream changes still need to be re-evaluated per docs/design-docs/2026-07-29-upstream-sync-policy.md.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What is this PR about?
Please describe in a short paragraph what this PR is about.
Checklist
Before submitting this PR, please make sure that:
canarybranch.Issues related (if applicable)
Screenshots (if applicable)