fix: backport dogfood CI fixes to release/2.29#24245
Merged
f0ssel merged 2 commits intorelease/2.29from Apr 10, 2026
Merged
Conversation
- Remove `TRIVY_VERSION` ARG and trivy CLI install block from `dogfood/coder/Dockerfile` - The `trivy` job in `.github/workflows/security.yaml` is kept — it uses `aquasecurity/trivy-action` pinned to a known-good commit > 🤖 This PR was created with the help of Coder Agents, and was reviewed by my human. 🧑💻
|
👋 Hey @f0ssel! This PR is targeting the Only bug fixes should be cherry-picked to release branches. If this is a bug fix, please update the PR title to match the conventional commit format: If this is not a bug fix, it likely should not target a release branch. |
spikecurtis
approved these changes
Apr 10, 2026
The `coder_app` resource no longer supports having both `command` and `subdomain` set simultaneously. This removes `subdomain = true` from the `develop_sh` app in dogfood, which uses `command`. This was the only `coder_app` in the repo with both fields set.
f0ssel
changed the title
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Cherry-picks two fixes onto
release/2.29that are both needed together to unblock CI:4c9041b2) — upstream Trivy v0.41.0 release artifact was deleted, causinggzip: stdin: not in gzip formatin thebuild_imagejob.fd634626) —coder_appno longer supports bothcommandandsubdomain, causingdeploy_templateto fail onterraform validate.Both commits are required for CI to pass — the first fixes the Docker build and the second fixes Terraform validation.