Skip to content

Commit 1344c73

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

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
HANDLEBARS_MODULE: "handlebars@4.7.8"
158158
COSIGN_VERSION: "v3.0.2"
159159
LOCAL_EXPORT_DIR: "/tmp/buildx-output"
@@ -820,22 +820,11 @@ jobs:
820820
const inpImageNames = core.getMultilineInput('image-names');
821821
const inpImageDigest = core.getInput('image-digest');
822822
823-
// ECR registry regexes: https://github.com/docker/login-action/blob/28fdb31ff34708d19615a74d67103ddc2ea9725c/src/aws.ts#L8-L9
824-
const ecrRegistryRegex = /^(([0-9]{12})\.(dkr\.ecr|dkr-ecr)\.(.+)\.(on\.aws|amazonaws\.com(.cn)?))(\/([^:]+)(:.+)?)?$/;
825-
const ecrPublicRegistryRegex = /public\.ecr\.aws|ecr-public\.aws\.com/;
826-
for (const imageName of inpImageNames) {
827-
if (ecrRegistryRegex.test(imageName) || ecrPublicRegistryRegex.test(imageName)) {
828-
core.info(`Detected ECR image name: ${imageName}, adding delay to mitigate eventual consistency issue`);
829-
// FIXME: remove once https://github.com/docker/github-builder/issues/30 is resolved
830-
await new Promise(resolve => setTimeout(resolve, 5000));
831-
break;
832-
}
833-
}
834-
835823
const sigstore = new Sigstore();
836824
const signResults = await sigstore.signAttestationManifests({
837825
imageNames: inpImageNames,
838-
imageDigest: inpImageDigest
826+
imageDigest: inpImageDigest,
827+
retryOnManifestUnknown: true
839828
});
840829
841830
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
HANDLEBARS_MODULE: "handlebars@4.7.8"
161161
COSIGN_VERSION: "v3.0.2"
162162
LOCAL_EXPORT_DIR: "/tmp/buildx-output"
@@ -684,22 +684,11 @@ jobs:
684684
const inpImageNames = core.getMultilineInput('image-names');
685685
const inpImageDigest = core.getInput('image-digest');
686686
687-
// ECR registry regexes: https://github.com/docker/login-action/blob/28fdb31ff34708d19615a74d67103ddc2ea9725c/src/aws.ts#L8-L9
688-
const ecrRegistryRegex = /^(([0-9]{12})\.(dkr\.ecr|dkr-ecr)\.(.+)\.(on\.aws|amazonaws\.com(.cn)?))(\/([^:]+)(:.+)?)?$/;
689-
const ecrPublicRegistryRegex = /public\.ecr\.aws|ecr-public\.aws\.com/;
690-
for (const imageName of inpImageNames) {
691-
if (ecrRegistryRegex.test(imageName) || ecrPublicRegistryRegex.test(imageName)) {
692-
core.info(`Detected ECR image name: ${imageName}, adding delay to mitigate eventual consistency issue`);
693-
// FIXME: remove once https://github.com/docker/github-builder/issues/30 is resolved
694-
await new Promise(resolve => setTimeout(resolve, 5000));
695-
break;
696-
}
697-
}
698-
699687
const sigstore = new Sigstore();
700688
const signResults = await sigstore.signAttestationManifests({
701689
imageNames: inpImageNames,
702-
imageDigest: inpImageDigest
690+
imageDigest: inpImageDigest,
691+
retryOnManifestUnknown: true
703692
});
704693
705694
const verifyResults = await sigstore.verifySignedManifests(signResults, {

0 commit comments

Comments
 (0)