Skip to content

Commit 88a5640

Browse files
committed
Fix canary version matching
Signed-off-by: apostasie <[email protected]>
1 parent d3cb96e commit 88a5640

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

hack/build-integration-canary.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,10 @@ canary::build::integration(){
276276
fi
277277

278278
while read -r line; do
279-
# Extract value after "=" from a possible dockerfile `ARG XXX_VERSION`
279+
# Extract value after "=" from a possible dockerfile `ARG XXX_VERSION`, stripping out @ suffixes
280280
old_version=$(echo "$line" | grep "ARG ${shortsafename}_VERSION=") || true
281281
old_version="${old_version##*=}"
282+
old_version="${old_version%%@*}"
282283
[ "$old_version" != "" ] || continue
283284
# If the Dockerfile version does NOT start with a v, adapt to that
284285
[ "${old_version:0:1}" == "v" ] || higher_readable="${higher_readable:1}"

0 commit comments

Comments
 (0)