Skip to content

Commit 60bacda

Browse files
committed
update actions-toolkit to 0.83.0
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
1 parent 1fbf7b5 commit 60bacda

File tree

2 files changed

+6
-28
lines changed

2 files changed

+6
-28
lines changed

.github/workflows/bake.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ env:
153153
BUILDKIT_IMAGE: "moby/buildkit:v0.28.0"
154154
SBOM_IMAGE: "docker/buildkit-syft-scanner:1.10.0"
155155
BINFMT_IMAGE: "tonistiigi/binfmt:qemu-v10.2.1-65"
156-
DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.81.0"
156+
DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.83.0"
157157
COSIGN_VERSION: "v3.0.2"
158158
LOCAL_EXPORT_DIR: "/tmp/buildx-output"
159159
MATRIX_SIZE_LIMIT: "20"
@@ -794,22 +794,11 @@ jobs:
794794
const inpImageNames = core.getMultilineInput('image-names');
795795
const inpImageDigest = core.getInput('image-digest');
796796
797-
// ECR registry regexes: https://github.com/docker/login-action/blob/28fdb31ff34708d19615a74d67103ddc2ea9725c/src/aws.ts#L8-L9
798-
const ecrRegistryRegex = /^(([0-9]{12})\.(dkr\.ecr|dkr-ecr)\.(.+)\.(on\.aws|amazonaws\.com(.cn)?))(\/([^:]+)(:.+)?)?$/;
799-
const ecrPublicRegistryRegex = /public\.ecr\.aws|ecr-public\.aws\.com/;
800-
for (const imageName of inpImageNames) {
801-
if (ecrRegistryRegex.test(imageName) || ecrPublicRegistryRegex.test(imageName)) {
802-
core.info(`Detected ECR image name: ${imageName}, adding delay to mitigate eventual consistency issue`);
803-
// FIXME: remove once https://github.com/docker/github-builder/issues/30 is resolved
804-
await new Promise(resolve => setTimeout(resolve, 5000));
805-
break;
806-
}
807-
}
808-
809797
const sigstore = new Sigstore();
810798
const signResults = await sigstore.signAttestationManifests({
811799
imageNames: inpImageNames,
812-
imageDigest: inpImageDigest
800+
imageDigest: inpImageDigest,
801+
retryOnManifestUnknown: true
813802
});
814803
815804
const verifyResults = await sigstore.verifySignedManifests(signResults, {

.github/workflows/build.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ env:
156156
BUILDKIT_IMAGE: "moby/buildkit:v0.28.0"
157157
SBOM_IMAGE: "docker/buildkit-syft-scanner:1.10.0"
158158
BINFMT_IMAGE: "tonistiigi/binfmt:qemu-v10.2.1-65"
159-
DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.81.0"
159+
DOCKER_ACTIONS_TOOLKIT_MODULE: "@docker/actions-toolkit@0.83.0"
160160
COSIGN_VERSION: "v3.0.2"
161161
LOCAL_EXPORT_DIR: "/tmp/buildx-output"
162162
MATRIX_SIZE_LIMIT: "20"
@@ -648,22 +648,11 @@ jobs:
648648
const inpImageNames = core.getMultilineInput('image-names');
649649
const inpImageDigest = core.getInput('image-digest');
650650
651-
// ECR registry regexes: https://github.com/docker/login-action/blob/28fdb31ff34708d19615a74d67103ddc2ea9725c/src/aws.ts#L8-L9
652-
const ecrRegistryRegex = /^(([0-9]{12})\.(dkr\.ecr|dkr-ecr)\.(.+)\.(on\.aws|amazonaws\.com(.cn)?))(\/([^:]+)(:.+)?)?$/;
653-
const ecrPublicRegistryRegex = /public\.ecr\.aws|ecr-public\.aws\.com/;
654-
for (const imageName of inpImageNames) {
655-
if (ecrRegistryRegex.test(imageName) || ecrPublicRegistryRegex.test(imageName)) {
656-
core.info(`Detected ECR image name: ${imageName}, adding delay to mitigate eventual consistency issue`);
657-
// FIXME: remove once https://github.com/docker/github-builder/issues/30 is resolved
658-
await new Promise(resolve => setTimeout(resolve, 5000));
659-
break;
660-
}
661-
}
662-
663651
const sigstore = new Sigstore();
664652
const signResults = await sigstore.signAttestationManifests({
665653
imageNames: inpImageNames,
666-
imageDigest: inpImageDigest
654+
imageDigest: inpImageDigest,
655+
retryOnManifestUnknown: true
667656
});
668657
669658
const verifyResults = await sigstore.verifySignedManifests(signResults, {

0 commit comments

Comments
 (0)