|
153 | 153 | BUILDKIT_IMAGE: "moby/buildkit:v0.28.0" |
154 | 154 | SBOM_IMAGE: "docker/buildkit-syft-scanner:1.10.0" |
155 | 155 | 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" |
157 | 157 | HANDLEBARS_MODULE: "handlebars@4.7.8" |
158 | 158 | COSIGN_VERSION: "v3.0.2" |
159 | 159 | LOCAL_EXPORT_DIR: "/tmp/buildx-output" |
@@ -820,22 +820,11 @@ jobs: |
820 | 820 | const inpImageNames = core.getMultilineInput('image-names'); |
821 | 821 | const inpImageDigest = core.getInput('image-digest'); |
822 | 822 | |
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 | | - |
835 | 823 | const sigstore = new Sigstore(); |
836 | 824 | const signResults = await sigstore.signAttestationManifests({ |
837 | 825 | imageNames: inpImageNames, |
838 | | - imageDigest: inpImageDigest |
| 826 | + imageDigest: inpImageDigest, |
| 827 | + retryOnManifestUnknown: true |
839 | 828 | }); |
840 | 829 | |
841 | 830 | const verifyResults = await sigstore.verifySignedManifests(signResults, { |
|
0 commit comments