Skip to content

CCM-15190: misc fixes #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhyscoxnhs merged 5 commits into from
Jun 12, 2026
Merged

CCM-15190: misc fixes #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5eb4fd7
fixed typo in make args in scripts/init.mk
cgitim Jun 11, 2026
18512cd
Handle missing ${name} in .tool-versions (fallback to "lastest")
cgitim Jun 11, 2026
b050843
fix pipefail and || precedence in content= pipeline
cgitim Jun 11, 2026
ac7004a
Unquote dangling image IDs to fix docker rmi cleanup
cgitim Jun 11, 2026
0dcb525
tabs->spaces
cgitim Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions scripts/docker/docker.lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ function docker-build() {
for version in $(_get-all-effective-versions) latest; do
docker tag "${DOCKER_IMAGE}:$(_get-effective-version)" "${DOCKER_IMAGE}:${version}"
done
docker rmi --force "$(docker images | grep "<none>" | awk '{print $3}')" 2> /dev/null ||:
local dangling_images="$(docker images -q -f dangling=true)"
[[ -n "$dangling_images" ]] && docker rmi --force $dangling_images 2> /dev/null ||:

return 0
}
Expand Down Expand Up @@ -188,7 +189,7 @@ function docker-get-image-version-and-pull() {
local versions_file="${TOOL_VERSIONS:=$(git rev-parse --show-toplevel)/.tool-versions}"
local version="latest"
if [[ -f "$versions_file" ]]; then
line=$(grep "docker/${name} " "$versions_file" | sed "s/^#\s*//; s/\s*#.*$//" | grep "${match_version:-".*"}")
line=$(grep "docker/${name} " "$versions_file" | sed "s/^#\s*//; s/\s*#.*$//" | grep "${match_version:-".*"}" || true)
[ -n "$line" ] && version=$(echo "$line" | awk '{print $2}')
fi

Expand Down Expand Up @@ -248,7 +249,7 @@ function _replace-image-latest-by-specific-version() {

if [[ -f "$versions_file" ]]; then
# First, list the entries specific for Docker to take precedence, then the rest but exclude comments
content=$(grep " docker/" "$versions_file"; grep -v " docker/" "$versions_file" ||: | grep -v "^#")
content=$({ grep " docker/" "$versions_file" || true; grep -v " docker/" "$versions_file" || true; } | grep -v "^#" || true)
echo "$content" | while IFS= read -r line; do
[ -z "$line" ] && continue
line=$(echo "$line" | sed "s/^#\s*//; s/\s*#.*$//" | sed "s;docker/;;")
Expand Down
2 changes: 1 addition & 1 deletion scripts/init.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ list-variables: # List all the variables available to make @Others
.NOTPARALLEL:
.ONESHELL:
.PHONY: * # Please do not change this line! The alternative usage of it introduces unnecessary complexity and is considered an anti-pattern.
MAKEFLAGS := --no-print-director
MAKEFLAGS := --no-print-directory
SHELL := /bin/bash
ifeq (true, $(shell [[ "${VERBOSE}" =~ ^(true|yes|y|on|1|TRUE|YES|Y|ON)$$ ]] && echo true))
.SHELLFLAGS := -cex
Expand Down