Repository navigation
refactor(docker): name API and worker configuration explicitly - #45376
Merged
Merged
Conversation
Rename shared.defaults to api-worker.defaults and use api-worker.env for new customizations so the file's name identifies the application services that share these settings. Keep loading existing shared.env files before api-worker.env. Preserve service-specific and root overrides, all existing consumers, and effective defaults. Update the Docker README and cover the legacy and new paths in the Compose environment regression suite.
github-actions
Bot
added
the
size:L
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #45376 +/- ##
==========================================
- Coverage 73.31% 73.31% -0.01%
==========================================
Files 6239 6239
Lines 390948 390948
Branches 79291 79291
==========================================
- Hits 286615 286606 -9
- Misses 98235 98243 +8
- Partials 6098 6099 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
laipz8200
marked this pull request as ready for review
November 3, 2026 03:27
laipz8200
enabled auto-merge
November 3, 2026 03:27
hjlarry
approved these changes
Nov 3, 2026
QuantumGhost
approved these changes
Nov 3, 2026
crazywoola
approved these changes
Nov 3, 2026
This was referenced Nov 3, 2026
cursor Bot
pushed a commit
to hiroppelx/dify
that referenced
this pull request
Nov 4, 2026
…ider Conflict: docker/envs/core-services/shared.env.example was deleted upstream (langgenius#45359/langgenius#45376 split Docker env into categorized *.defaults files). Accepted the deletion and moved the AWS_KMS_* keys next to the AZURE_KEYVAULT_* keys in docker/envs/core-services/api-worker.defaults as commented optional settings, matching the new convention. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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
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.
Summary
shared.defaultsdoes not identify which services share its settings. Rename it toapi-worker.defaults, withapi-worker.envas the customization path for common API and worker application settings, including Beat.Continue loading existing
shared.envfiles beforeapi-worker.env. The new file takes precedence when both define a setting; service-specific overrides and root.envretain their existing precedence. Effective defaults and the existing service consumers remain unchanged, and no user configuration files are rewritten.Update the Docker README and the corresponding English, Chinese, and Japanese documentation in langgenius/dify-docs#1171.
Follow-up to #45359. Related to #45358.
Checklist