Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ to the public under the [project's open source license](../LICENSE).

## Submitting a pull request

1. [Fork](https://github.com/docker/github-builder-experimental/fork) and clone the repository
1. [Fork](https://github.com/docker/github-builder/fork) and clone the repository
2. Create a new branch: `git checkout -b my-branch-name`
3. Make your changes
4. Push to your fork and [submit a pull request](https://github.com/docker/github-builder-experimental/compare)
4. Push to your fork and [submit a pull request](https://github.com/docker/github-builder/compare)
5. Pat your self on the back and wait for your pull request to be reviewed and merged.

Here are a few things you can do that will increase the likelihood of your pull request being accepted:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body:
description: >
Make sure you've read the contributing guidelines before proceeding.
options:
- label: I've read the [contributing guidelines](https://github.com/docker/github-builder-experimental/blob/master/.github/CONTRIBUTING.md) and wholeheartedly agree
- label: I've read the [contributing guidelines](https://github.com/docker/github-builder/blob/main/.github/CONTRIBUTING.md) and wholeheartedly agree
required: true

- type: checkboxes
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
blank_issues_enabled: true
contact_links:
- name: Questions and Discussions
url: https://github.com/docker/github-builder-experimental/discussions/new
url: https://github.com/docker/github-builder/discussions/new
about: Use Github Discussions to ask questions and/or open discussion topics.
- name: Documentation
url: https://docs.docker.com/build/ci/github-actions/
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/bake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ jobs:
[cache.gha.verify.policy]
timestampThreshold = 1
tlogThreshold = ${{ needs.prepare.outputs.privateRepo == 'true' && '0' || '1' }}
subjectAlternativeName = "https://github.com/docker/github-builder-experimental/.github/workflows/bake.yml*"
subjectAlternativeName = "https://github.com/docker/github-builder/.github/workflows/bake.yml*"
githubWorkflowRepository = "${{ github.repository }}"
issuer = "https://token.actions.githubusercontent.com"
runnerEnvironment = "github-hosted"
Expand Down Expand Up @@ -785,7 +785,7 @@ jobs:
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
// FIXME: remove once https://github.com/docker/github-builder/issues/30 is resolved
await new Promise(resolve => setTimeout(resolve, 5000));
break;
}
Expand All @@ -798,7 +798,7 @@ jobs:
});

const verifyResults = await sigstore.verifySignedManifests(signResults, {
certificateIdentityRegexp: `^https://github.com/docker/github-builder-experimental/.github/workflows/bake.yml.*$`,
certificateIdentityRegexp: `^https://github.com/docker/github-builder/.github/workflows/bake.yml.*$`,
retryOnManifestUnknown: true
});

Expand Down Expand Up @@ -830,7 +830,7 @@ jobs:
});

const verifyResults = await sigstore.verifySignedArtifacts(signResults, {
certificateIdentityRegexp: `^https://github.com/docker/github-builder-experimental/.github/workflows/bake.yml.*$`
certificateIdentityRegexp: `^https://github.com/docker/github-builder/.github/workflows/bake.yml.*$`
});

await core.group(`Verify commands`, async () => {
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ jobs:
[cache.gha.verify.policy]
timestampThreshold = 1
tlogThreshold = ${{ needs.prepare.outputs.privateRepo == 'true' && '0' || '1' }}
subjectAlternativeName = "https://github.com/docker/github-builder-experimental/.github/workflows/build.yml*"
subjectAlternativeName = "https://github.com/docker/github-builder/.github/workflows/build.yml*"
githubWorkflowRepository = "${{ github.repository }}"
issuer = "https://token.actions.githubusercontent.com"
runnerEnvironment = "github-hosted"
Expand Down Expand Up @@ -650,7 +650,7 @@ jobs:
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
// FIXME: remove once https://github.com/docker/github-builder/issues/30 is resolved
await new Promise(resolve => setTimeout(resolve, 5000));
break;
}
Expand All @@ -663,7 +663,7 @@ jobs:
});

const verifyResults = await sigstore.verifySignedManifests(signResults, {
certificateIdentityRegexp: `^https://github.com/docker/github-builder-experimental/.github/workflows/build.yml.*$`,
certificateIdentityRegexp: `^https://github.com/docker/github-builder/.github/workflows/build.yml.*$`,
retryOnManifestUnknown: true
});

Expand Down Expand Up @@ -695,7 +695,7 @@ jobs:
});

const verifyResults = await sigstore.verifySignedArtifacts(signResults, {
certificateIdentityRegexp: `^https://github.com/docker/github-builder-experimental/.github/workflows/build.yml.*$`
certificateIdentityRegexp: `^https://github.com/docker/github-builder/.github/workflows/build.yml.*$`
});

await core.group(`Verify commands`, async () => {
Expand Down
23 changes: 7 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
[![Test build workflow](https://img.shields.io/github/actions/workflow/status/docker/github-builder-experimental/.test-build.yml?label=test%20build&logo=github&style=flat-square)](https://github.com/docker/github-builder-experimental/actions?workflow=.test-build)
[![Test bake workflow](https://img.shields.io/github/actions/workflow/status/docker/github-builder-experimental/.test-bake.yml?label=test%20bake&logo=github&style=flat-square)](https://github.com/docker/github-builder-experimental/actions?workflow=.test-bake)

> [!CAUTION]
> Do not use it for your production workflows yet!

## :test_tube: Experimental

This repository is considered **EXPERIMENTAL** and under active development
until further notice. It is subject to non-backward compatible changes or
removal in any future version.
[![Test build workflow](https://img.shields.io/github/actions/workflow/status/docker/github-builder/.test-build.yml?label=test%20build&logo=github&style=flat-square)](https://github.com/docker/github-builder/actions?workflow=.test-build)
[![Test bake workflow](https://img.shields.io/github/actions/workflow/status/docker/github-builder/.test-bake.yml?label=test%20bake&logo=github&style=flat-square)](https://github.com/docker/github-builder/actions?workflow=.test-bake)

___

Expand Down Expand Up @@ -49,7 +40,7 @@ on:
pull_request:

build:
uses: docker/github-builder-experimental/.github/workflows/build.yml@main
uses: docker/github-builder/.github/workflows/build.yml@v1
permissions:
contents: read # to fetch the repository content
id-token: write # for signing attestation(s) with GitHub OIDC Token
Expand Down Expand Up @@ -174,7 +165,7 @@ on:
pull_request:

build:
uses: docker/github-builder-experimental/.github/workflows/build.yml@main
uses: docker/github-builder/.github/workflows/build.yml@v1
permissions:
contents: read # to fetch the repository content
id-token: write # for signing attestation(s) with GitHub OIDC Token
Expand All @@ -197,7 +188,7 @@ on:
# in the `build` job and can be omitted. It's provided here as an example of
# how to use the `verify.yml` reusable workflow.
build-verify:
uses: docker/github-builder-experimental/.github/workflows/verify.yml@main
uses: docker/github-builder/.github/workflows/verify.yml@v1
if: ${{ github.event_name != 'pull_request' }}
needs:
- build
Expand Down Expand Up @@ -286,7 +277,7 @@ on:
pull_request:

bake:
uses: docker/github-builder-experimental/.github/workflows/bake.yml@main
uses: docker/github-builder/.github/workflows/bake.yml@v1
permissions:
contents: read # to fetch the repository content
id-token: write # for signing attestation(s) with GitHub OIDC Token
Expand All @@ -308,7 +299,7 @@ on:
# in the `bake` job and can be omitted. It's provided here as an example of
# how to use the `verify.yml` reusable workflow.
bake-verify:
uses: docker/github-builder-experimental/.github/workflows/verify.yml@main
uses: docker/github-builder/.github/workflows/verify.yml@v1
if: ${{ github.event_name != 'pull_request' }}
needs:
- bake
Expand Down
Loading