Skip to content

CCM-15190: misc fixes#117

Merged
rhyscoxnhs merged 5 commits into
mainfrom
feature/CCM-15190-misc-fixes
Jun 12, 2026
Merged

CCM-15190: misc fixes#117
rhyscoxnhs merged 5 commits into
mainfrom
feature/CCM-15190-misc-fixes

Conversation

@cgitim

@cgitim cgitim commented Jun 11, 2026

Copy link
Copy Markdown

Description

Misc. fixes, noticed by copilot review.

Context

Summary:

  • Unquote dangling image IDs to fix docker rmi cleanup
  • fix pipefail and || precedence in content= pipeline
  • Handle missing ${name} in .tool-versions (fallback to "lastest")
  • fixed typo in make args in scripts/init.mk

Type of changes

  • Refactoring (non-breaking change)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would change existing functionality)
  • Bug fix (non-breaking change which fixes an issue)

Checklist

  • I am familiar with the contributing guidelines
  • I have followed the code style of the project
  • I have added tests to cover my changes
  • I have updated the documentation accordingly
  • This PR is a result of pair or mob programming

Sensitive Information Declaration

To ensure the utmost confidentiality and protect your and others privacy, we kindly ask you to NOT including PII (Personal Identifiable Information) / PID (Personal Identifiable Data) or any other sensitive data in this PR (Pull Request) and the codebase changes. We will remove any PR that do contain any sensitive information. We really appreciate your cooperation in this matter.

  • I confirm that neither PII/PID nor sensitive data are included in this PR and the codebase changes.

cgitim added 4 commits June 11, 2026 23:09
With set -euo pipefail, this grep | ... | grep pipeline will terminate the
script when there is no matching docker/${name} entry in .tool-versions (a
normal case). The command substitution should tolerate no matches and fall back
to latest.
content=$(grep ...; grep -v ... ||: | grep -v ...) has two issues under set -euo
pipefail: (1) the first grep will exit non-zero when there are no Docker-
specific entries, which will abort the script; and (2) due to ||/| precedence,
the grep -v "^#" filter is not applied when the second grep -v succeeds. This
can break Docker builds in repos without docker/ entries in .tool-versions.
docker rmi --force "$(...)" quotes the list of dangling image IDs, which can
collapse multiple IDs into a single argument and prevent cleanup from working
correctly. Collect the IDs and pass them as separate arguments.
@cgitim cgitim requested a review from a team as a code owner June 11, 2026 22:45
@cgitim cgitim changed the title CCM-15190 misc fixes CCM-15190: misc fixes Jun 11, 2026
@rhyscoxnhs rhyscoxnhs merged commit d645507 into main Jun 12, 2026
30 checks passed
@rhyscoxnhs rhyscoxnhs deleted the feature/CCM-15190-misc-fixes branch June 12, 2026 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants