From 6b8ed97f8c88e9ed0079e09c6d9e29fa78202bd8 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Fri, 9 Feb 2024 21:32:11 +0100
Subject: [PATCH] build: fix docker image signing (#27208)
---
tools/publish-release.ts | 16 ++++++++++------
tools/utils/docker.ts | 4 ++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/tools/publish-release.ts b/tools/publish-release.ts
index ba80df3326..3e37271664 100644
--- a/tools/publish-release.ts
+++ b/tools/publish-release.ts
@@ -24,25 +24,29 @@ void (async () => {
logger.info(`Publishing v${opts.version}...`);
const meta = await bake('push', opts);
- if (meta?.['build-slim']?.['containerimage.digest']) {
+ if (meta?.['push-slim']?.['containerimage.digest']) {
sign(
- `ghcr.io/${process.env.OWNER}/${process.env.FILE}${meta['build-slim']['containerimage.digest']}`,
+ `ghcr.io/${process.env.OWNER}/${process.env.FILE}${meta['push-slim']['containerimage.digest']}`,
opts,
);
sign(
- `${process.env.FILE}/${process.env.FILE}${meta['build-slim']['containerimage.digest']}`,
+ `${process.env.FILE}/${process.env.FILE}${meta['push-slim']['containerimage.digest']}`,
opts,
);
+ } else {
+ logger.warn('Skip signing, missing metadata for slim image');
}
- if (meta?.['build-full']?.['containerimage.digest']) {
+ if (meta?.['push-full']?.['containerimage.digest']) {
sign(
- `ghcr.io/${process.env.OWNER}/${process.env.FILE}@${meta['build-full']['containerimage.digest']}`,
+ `ghcr.io/${process.env.OWNER}/${process.env.FILE}@${meta['push-full']['containerimage.digest']}`,
opts,
);
sign(
- `${process.env.FILE}/${process.env.FILE}@${meta['build-full']['containerimage.digest']}`,
+ `${process.env.FILE}/${process.env.FILE}@${meta['push-full']['containerimage.digest']}`,
opts,
);
+ } else {
+ logger.warn('Skip signing, missing metadata for full image');
}
})();
diff --git a/tools/utils/docker.ts b/tools/utils/docker.ts
index c9f686b25b..97df6c4590 100644
--- a/tools/utils/docker.ts
+++ b/tools/utils/docker.ts
@@ -14,8 +14,8 @@ export type MetaDataItem = {
'containerimage.digest'?: string;
};
export type MetaData = {
- 'build-slim': MetaDataItem;
- 'build-full': MetaDataItem;
+ 'push-slim'?: MetaDataItem;
+ 'push-full'?: MetaDataItem;
};
export async function bake(
--
GitLab