From a459c7c911d8894666252eca1eb46102741047c4 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 26 Apr 2024 13:26:38 +0200 Subject: [PATCH] buildx: ensure consistent metadata filename for bake and build Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- src/buildx/bake.ts | 2 +- src/buildx/build.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/buildx/bake.ts b/src/buildx/bake.ts index 3b86fe1..44fa8ad 100644 --- a/src/buildx/bake.ts +++ b/src/buildx/bake.ts @@ -52,7 +52,7 @@ export class Bake { } public static getMetadataFilePath(): string { - return path.join(Context.tmpDir(), 'metadata-file'); + return path.join(Context.tmpDir(), 'bake-metadata.json'); } public static resolveMetadata(): BakeMetadata | undefined { diff --git a/src/buildx/build.ts b/src/buildx/build.ts index 4352a7a..2f7a11c 100644 --- a/src/buildx/build.ts +++ b/src/buildx/build.ts @@ -27,11 +27,7 @@ import {BuildMetadata} from '../types/build'; export class Build { public static getImageIDFilePath(): string { - return path.join(Context.tmpDir(), 'iidfile'); - } - - public static getMetadataFilePath(): string { - return path.join(Context.tmpDir(), 'metadata-file'); + return path.join(Context.tmpDir(), 'build-iidfile.txt'); } public static resolveImageID(): string | undefined { @@ -42,6 +38,10 @@ export class Build { return fs.readFileSync(iidFile, {encoding: 'utf-8'}).trim(); } + public static getMetadataFilePath(): string { + return path.join(Context.tmpDir(), 'build-metadata.json'); + } + public static resolveMetadata(): BuildMetadata | undefined { const metadataFile = Build.getMetadataFilePath(); if (!fs.existsSync(metadataFile)) {