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
26 changes: 13 additions & 13 deletions .github/workflows/.test-bake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
connection_id: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}

bake-dockerhub-single-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- bake-dockerhub-single
steps:
Expand Down Expand Up @@ -157,9 +157,9 @@ jobs:
output: image
push: ${{ github.event_name != 'pull_request' }}
runner: |
default=ubuntu-24.04
linux/arm=ubuntu-24.04-arm
linux/arm64=ubuntu-24.04-arm
default=ubuntu-26.04
linux/arm=ubuntu-26.04-arm
linux/arm64=ubuntu-26.04-arm
sbom: true
set: |
*.args.VERSION={{meta.version}}
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
connection_id: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}

bake-dockerhub-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- bake-dockerhub
steps:
Expand All @@ -206,7 +206,7 @@ jobs:
core.info(JSON.stringify(builderOutputs, null, 2));

bake-dockerhub-scan:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
if: ${{ github.event_name != 'pull_request' }}
needs:
- bake-dockerhub
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
builder-outputs: ${{ toJSON(needs.bake-dockerhub-nosign.outputs) }}

bake-dockerhub-nosign-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- bake-dockerhub-nosign
steps:
Expand Down Expand Up @@ -318,7 +318,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

bake-ghcr-and-dockerhub-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- bake-ghcr-and-dockerhub
steps:
Expand Down Expand Up @@ -356,7 +356,7 @@ jobs:
builder-outputs: ${{ toJSON(needs.bake-local.outputs) }}

bake-local-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- bake-local
steps:
Expand Down Expand Up @@ -393,7 +393,7 @@ jobs:
builder-outputs: ${{ toJSON(needs.bake-local-single.outputs) }}

bake-local-single-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- bake-local-single
steps:
Expand Down Expand Up @@ -427,7 +427,7 @@ jobs:
builder-outputs: ${{ toJSON(needs.bake-local-noupload.outputs) }}

bake-local-noupload-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- bake-local-noupload
steps:
Expand Down Expand Up @@ -463,7 +463,7 @@ jobs:
builder-outputs: ${{ toJSON(needs.bake-local-nosign.outputs) }}

bake-local-nosign-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- bake-local-nosign
steps:
Expand Down Expand Up @@ -504,7 +504,7 @@ jobs:
contents: read
id-token: write
with:
runner: ubuntu-24.04
runner: ubuntu-26.04
context: test
output: image
push: false
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/.test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
connection_id: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}

build-dockerhub-single-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- build-dockerhub-single
steps:
Expand Down Expand Up @@ -156,9 +156,9 @@ jobs:
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
runner: |
default=ubuntu-24.04
linux/arm=ubuntu-24.04-arm
linux/arm64=ubuntu-24.04-arm
default=ubuntu-26.04
linux/arm=ubuntu-26.04-arm
linux/arm64=ubuntu-26.04-arm
sbom: true
registry-identities: |
- type: dockerhub
Expand Down Expand Up @@ -187,7 +187,7 @@ jobs:
connection_id: ${{ vars.DOCKERHUB_OIDC_CONNECTIONID }}

build-dockerhub-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- build-dockerhub
steps:
Expand All @@ -202,7 +202,7 @@ jobs:
core.info(JSON.stringify(builderOutputs, null, 2));

build-dockerhub-scan:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
if: ${{ github.event_name != 'pull_request' }}
needs:
- build-dockerhub
Expand Down Expand Up @@ -248,7 +248,7 @@ jobs:
builder-outputs: ${{ toJSON(needs.build-dockerhub-nosign.outputs) }}

build-dockerhub-nosign-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- build-dockerhub-nosign
steps:
Expand Down Expand Up @@ -299,7 +299,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

build-ghcr-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- build-ghcr
steps:
Expand Down Expand Up @@ -365,7 +365,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

build-ghcr-and-dockerhub-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- build-ghcr-and-dockerhub
steps:
Expand Down Expand Up @@ -403,7 +403,7 @@ jobs:
builder-outputs: ${{ toJSON(needs.build-local.outputs) }}

build-local-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- build-local
steps:
Expand Down Expand Up @@ -439,7 +439,7 @@ jobs:
builder-outputs: ${{ toJSON(needs.build-local-single.outputs) }}

build-local-single-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- build-local-single
steps:
Expand Down Expand Up @@ -473,7 +473,7 @@ jobs:
builder-outputs: ${{ toJSON(needs.build-local-noupload.outputs) }}

build-local-noupload-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- build-local-noupload
steps:
Expand Down Expand Up @@ -509,7 +509,7 @@ jobs:
builder-outputs: ${{ toJSON(needs.build-local-nosign.outputs) }}

build-local-nosign-outputs:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- build-local-nosign
steps:
Expand Down Expand Up @@ -548,7 +548,7 @@ jobs:
contents: read
id-token: write
with:
runner: ubuntu-24.04
runner: ubuntu-26.04
build-args: |
VERSION={{meta.version}}
file: test/hello.Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/.update-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:

jobs:
update:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
environment: update-deps # secrets are gated by this environment
timeout-minutes: 10
permissions:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/bake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
description: "GitHub-hosted Linux runner label or platform mapping to build on"
required: false
default: |
default=ubuntu-24.04
linux/arm=ubuntu-24.04-arm
linux/arm64=ubuntu-24.04-arm
default=ubuntu-26.04
linux/arm=ubuntu-26.04-arm
linux/arm64=ubuntu-26.04-arm
distribute:
type: boolean
description: "Whether to distribute the build across multiple runners (one platform per runner)"
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
registry-identities: ${{ inputs.registry-identities }}

prepare:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -1150,7 +1150,7 @@ jobs:
core.setOutput(`result_${inpIndex}`, JSON.stringify(result));

finalize:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
strategy:
matrix:
include:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
description: "GitHub-hosted Linux runner label or platform mapping to build on"
required: false
default: |
default=ubuntu-24.04
linux/arm=ubuntu-24.04-arm
linux/arm64=ubuntu-24.04-arm
default=ubuntu-26.04
linux/arm=ubuntu-26.04-arm
linux/arm64=ubuntu-26.04-arm
distribute:
type: boolean
description: "Whether to distribute the build across multiple runners (one platform per runner)"
Expand Down Expand Up @@ -224,7 +224,7 @@ jobs:
registry-identities: ${{ inputs.registry-identities }}

prepare:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -1047,7 +1047,7 @@ jobs:
core.setOutput(`result_${inpIndex}`, JSON.stringify(result));

finalize:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
strategy:
matrix:
include:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/setup-registry-identities.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ env:

jobs:
setup-registry-identities:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
outputs:
aws-ecr-enabled: ${{ steps.validate.outputs.aws-ecr-enabled }}
aws-ecr-registry: ${{ steps.validate.outputs.aws-ecr-registry }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
registry-identities: ${{ inputs.registry-identities }}

verify:
runs-on: ubuntu-24.04
runs-on: ubuntu-26.04
needs:
- registry-identities
env:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -723,26 +723,26 @@ The `runner` input accepts either a single GitHub-hosted Linux runner label or a
newline-delimited platform mapping. A single label is used for every build:

```yaml
runner: ubuntu-24.04
runner: ubuntu-26.04
```

The default value uses the standard GitHub-hosted Ubuntu runners:

```yaml
runner: |
default=ubuntu-24.04
linux/arm=ubuntu-24.04-arm
linux/arm64=ubuntu-24.04-arm
default=ubuntu-26.04
linux/arm=ubuntu-26.04-arm
linux/arm64=ubuntu-26.04-arm
```

A mapping must define a `default` runner. Additional keys are platform prefixes,
and the most specific matching prefix wins. For example:

```yaml
runner: |
default=ubuntu-24.04
linux=ubuntu-24.04
linux/arm=ubuntu-24.04-arm
default=ubuntu-26.04
linux=ubuntu-26.04
linux/arm=ubuntu-26.04-arm
```

For example, `linux` matches all Linux platforms, `linux/arm` matches variants
Expand Down
Loading