ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-03-23 20:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure the finish event is always reported when fetching images

Browse Source 
Change-type: patch
This commit is contained in:
Pagan Gazzard 2022-01-18 11:44:40 +00:00
parent 6796383437
commit ae501048f5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compose/images.ts
View File

@ -172,7 +172,7 @@ export function imageFromService(service: ServiceInfo): Image {
export async function triggerFetch(
image: Image,
opts: FetchOptions,
onFinish = _.noop,
onFinish: (success: boolean) => void,
serviceName: string,
): Promise<void> {
const appUpdatePollInterval = await config.get('appUpdatePollInterval');
@ -202,8 +202,7 @@ export async function triggerFetch(
let success: boolean;
try {
const imageName = normalise(image.name);
image = _.clone(image);
image.name = imageName;
image = { ...image, name: imageName };
// Look for a matching image on the engine
const img = await inspectByName(image.name);
@ -214,8 +213,7 @@ export async function triggerFetch(
// Create image on the database if it already exists on the engine
await markAsSupervised({ ...image, dockerImageId: img.Id });
onFinish(true);
return;
success = true;
} catch (e) {
if (!NotFoundError(e)) {
if (!(e instanceof ImageDownloadBackoffError)) {