From f6e802a0d865f64c5e408bdef8e6c3153b1e9842 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 11 Mar 2021 16:56:52 -0500 Subject: [PATCH] cephadm: use image id, not name, when inspecting for RepoDigests The name is ambiguous, but the image_id is not! This fixes problems during upgrade where upgrade thinks the container is upgraded (due to an incorrect digest) when in fact it is not. Fixes: 0826c45e0cb5d60fcf8cd71cd14edd34a6997cd4 Signed-off-by: Sage Weil --- src/cephadm/cephadm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 81f876d689fcf..7d2d25505989e 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -4647,7 +4647,7 @@ def list_daemons(ctx, detail=True, legacy_dir=None): out, err, code = call( ctx, [ - container_path, 'image', 'inspect', image_name, + container_path, 'image', 'inspect', image_id, '--format', '{{.RepoDigests}}', ], verbosity=CallVerbosity.DEBUG) -- 2.39.5