Skip to content

Commit 5c2718c

Browse files
committed
CI: Follow-up fixes for dockers build on master
1 parent 39a1cfd commit 5c2718c

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

ci/praktika/docker.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,12 @@ def merge_manifest(
9494
commands.append(f"docker manifest push {config.name}:{digests[config.name]}")
9595

9696
if add_latest:
97-
commands.append(f"docker tag {config.name}:{tags[0]} {config.name}:latest")
98-
commands.append(f"docker push {config.name}:latest")
97+
tags[0] = "latest"
98+
commands += [
99+
"docker manifest create --amend "
100+
+ " ".join(f"{config.name}:{t}" for t in tags)
101+
]
102+
commands.append(f"docker manifest push {config.name}:latest")
99103

100104
return Result.from_commands_run(
101105
name=f"merge: {config.name}:{digests[config.name]} (latest={add_latest})",

ci/praktika/result.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,10 @@ def _add_job_summary_to_info(self):
222222
self.set_info(f"Failed: {failed_tcs}")
223223

224224
# Suggest local command to rerun
225-
if with_local_run_command:
226-
command_info = f'To run locally: python -m ci.praktika run "{self.name}"'
227-
if with_test_in_run_command and failed:
228-
command_info += f" --test {failed[0]}"
229-
self.set_info(command_info)
225+
command_info = f'To run locally: python -m ci.praktika run "{self.name}"'
226+
if with_test_in_run_command and failed:
227+
command_info += f" --test {failed[0]}"
228+
self.set_info(command_info)
230229

231230
return self
232231

0 commit comments

Comments
 (0)