Commit 802cfbf
committed
fix(resolver): dedupe override.yml; apply gpu_backends filter to user-extensions
Two resolver-layer defects fixed together because they cluster in
the same call chain.
1. installers/lib/compose-select.sh double-appended
docker-compose.override.yml to COMPOSE_FLAGS. scripts/resolve-
compose-stack.sh already appends it once when its env output is
consumed by compose-select.sh's load_env_from_output. Removing
the redundant bash-level append leaves the resolver as the single
source of truth.
2. scripts/resolve-compose-stack.sh included every
data/user-extensions/<id>/compose.yaml unconditionally, bypassing
the gpu_backends compatibility check that the built-in extension
loop already performs. An NVIDIA-only user extension installed on
AMD/Apple would be merged into the stack and fail at container
start. This adds the same manifest read + schema_version +
gpu_backends filter the built-in loop uses, verbatim, including
"all"/"none" sentinels and the narrow-dispatch error handling
gated by skip_broken.1 parent d5154c3 commit 802cfbf
2 files changed
Lines changed: 46 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | 105 | | |
113 | 106 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
223 | 223 | | |
224 | 224 | | |
225 | 225 | | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
226 | 232 | | |
227 | 233 | | |
228 | 234 | | |
229 | 235 | | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
230 | 276 | | |
231 | 277 | | |
232 | 278 | | |
| |||
0 commit comments