Skip to content

only wait for AWS ECR before signing attestation manifests #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crazy-max merged 2 commits into from
Dec 1, 2025
Merged

only wait for AWS ECR before signing attestation manifests #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
995cedc
chore: linguist ignore test dir
crazy-max Dec 1, 2025
0396b4e
only wait for AWS ECR before signing attestation manifests
crazy-max Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/test/** export-ignore
15 changes: 12 additions & 3 deletions .github/workflows/bake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,14 +551,23 @@ jobs:
INPUT_IMAGE-DIGEST: ${{ steps.get-image-digest.outputs.digest }}
with:
script: |
// FIXME: remove once https://github.com/docker/github-builder-experimental/issues/30 is resolved
await new Promise(resolve => setTimeout(resolve, 2000));

const { Sigstore } = require('@docker/actions-toolkit/lib/sigstore/sigstore');

const inpImageNames = core.getMultilineInput('image-names');
const inpImageDigest = core.getInput('image-digest');

// ECR registry regexes: https://github.com/docker/login-action/blob/28fdb31ff34708d19615a74d67103ddc2ea9725c/src/aws.ts#L8-L9
const ecrRegistryRegex = /^(([0-9]{12})\.(dkr\.ecr|dkr-ecr)\.(.+)\.(on\.aws|amazonaws\.com(.cn)?))(\/([^:]+)(:.+)?)?$/;
const ecrPublicRegistryRegex = /public\.ecr\.aws|ecr-public\.aws\.com/;
for (const imageName of inpImageNames) {
if (ecrRegistryRegex.test(imageName) || ecrPublicRegistryRegex.test(imageName)) {
core.info(`Detected ECR image name: ${imageName}, adding delay to mitigate eventual consistency issue`);
// FIXME: remove once https://github.com/docker/github-builder-experimental/issues/30 is resolved
await new Promise(resolve => setTimeout(resolve, 5000));
break;
}
}

const sigstore = new Sigstore();
const signResults = await sigstore.signAttestationManifests({
imageNames: inpImageNames,
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,14 +445,23 @@ jobs:
INPUT_IMAGE-DIGEST: ${{ steps.build.outputs.digest }}
with:
script: |
// FIXME: remove once https://github.com/docker/github-builder-experimental/issues/30 is resolved
await new Promise(resolve => setTimeout(resolve, 2000));

const { Sigstore } = require('@docker/actions-toolkit/lib/sigstore/sigstore');

const inpImageNames = core.getMultilineInput('image-names');
const inpImageDigest = core.getInput('image-digest');

// ECR registry regexes: https://github.com/docker/login-action/blob/28fdb31ff34708d19615a74d67103ddc2ea9725c/src/aws.ts#L8-L9
const ecrRegistryRegex = /^(([0-9]{12})\.(dkr\.ecr|dkr-ecr)\.(.+)\.(on\.aws|amazonaws\.com(.cn)?))(\/([^:]+)(:.+)?)?$/;
const ecrPublicRegistryRegex = /public\.ecr\.aws|ecr-public\.aws\.com/;
for (const imageName of inpImageNames) {
if (ecrRegistryRegex.test(imageName) || ecrPublicRegistryRegex.test(imageName)) {
core.info(`Detected ECR image name: ${imageName}, adding delay to mitigate eventual consistency issue`);
// FIXME: remove once https://github.com/docker/github-builder-experimental/issues/30 is resolved
await new Promise(resolve => setTimeout(resolve, 5000));
break;
}
}

const sigstore = new Sigstore();
const signResults = await sigstore.signAttestationManifests({
imageNames: inpImageNames,
Expand Down