ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-22 06:57:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1318 from balena-io/fix-multiple-image-use-push

Browse Source 
Fix using an image more than once in a balena push
This commit is contained in:
CameronDiver 2019-06-20 09:31:34 -07:00 committed by GitHub
commit 65ab3008e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/utils/device/deploy.ts
View File

@ -315,6 +315,8 @@ export async function performBuilds(
// Check for failures // Check for failures
await inspectBuildResults(localImages); await inspectBuildResults(localImages);
const imagesToRemove: string[] = [];
// Now tag any external images with the correct name that they should be, // Now tag any external images with the correct name that they should be,
// as this won't be done by resin-multibuild // as this won't be done by resin-multibuild
await Bluebird.map(localImages, async localImage => { await Bluebird.map(localImages, async localImage => {
@ -325,10 +327,14 @@ export async function performBuilds(
repo: generateImageName(localImage.serviceName), repo: generateImageName(localImage.serviceName),
force: true, force: true,
}); });
await image.remove({ force: true }); imagesToRemove.push(localImage.name!);
} }
}); });
await Bluebird.map(_.uniq(imagesToRemove), image =>
docker.getImage(image).remove({ force: true }),
);
return buildTasks; return buildTasks;
} }