Remove existing image before creating manifest

rebuy-de · Oct 19, 2023 · 435f069 · 435f069
1 parent 4bd5251
commit 435f069
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/buildah.ts b/src/buildah.ts
@@ -201,6 +201,14 @@ export class BuildahCli implements Buildah {
         await this.execute(args, execOptions);
     }
 
+    async imageRm(manifest: string): Promise<void> {
+        const execOptions: exec.ExecOptions = { ignoreReturnCode: true };
+        const args: string[] = [ "image", "rm" ];
+        args.push(manifest);
+        core.info(`Removing existing image ${manifest}`);
+        await this.execute(args, execOptions);
+    }
+
     async manifestCreate(manifest: string): Promise<void> {
         const args: string[] = [ "manifest", "create" ];
         args.push(manifest);

diff --git a/src/index.ts b/src/index.ts
@@ -111,6 +111,7 @@ export async function run(): Promise<void> {
             const manifestName = getFullImageName(normalizedImage, tag);
             // Force-remove existing manifest to prevent errors on recurring build on the same machine
             await cli.manifestRm(manifestName);
+            await cli.imageRm(manifestName);
             await cli.manifestCreate(manifestName);
             builtManifest.push(manifestName);