Skip to content

ci: update runner to ubuntu-24.04 and bake action to v6 #197

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 3 commits into from
Jun 7, 2025
Merged

ci: update runner to ubuntu-24.04 and bake action to v6 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2471f8
ci: update runner to ubuntu-24.04
crazy-max Jun 7, 2025
f3b6dca
ci: update bake-action to v6
crazy-max Jun 7, 2025
737f7fe
bake: fix fs entitlement
crazy-max Jun 7, 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
9 changes: 5 additions & 4 deletions .github/workflows/.build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:

jobs:
prepare:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
outputs:
pkgs: ${{ steps.set.outputs.pkgs }}
fail-fast: ${{ steps.set.outputs.fail-fast }}
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
echo fail-fast=${{ steps.set.outputs.fail-fast }}

build:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs:
- prepare
strategy:
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
retention-days: 1

dummy-release:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs:
- build
steps:
Expand Down Expand Up @@ -175,9 +175,10 @@ jobs:
EOF
-
name: Release
uses: docker/bake-action@v4
uses: docker/bake-action@v6
with:
workdir: ./pkg/${{ inputs.name }}
source: .
targets: release
provenance: false
set: |
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/.release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:

jobs:
prepare:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
outputs:
pkgs: ${{ steps.set.outputs.pkgs }}
steps:
Expand All @@ -39,7 +39,7 @@ jobs:
echo pkgs=${{ steps.set.outputs.pkgs }}

build:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs:
- prepare
strategy:
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
retention-days: 1

release:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs:
- build
steps:
Expand Down Expand Up @@ -177,9 +177,10 @@ jobs:
-
name: Build image
id: build
uses: docker/bake-action@v4
uses: docker/bake-action@v6
with:
workdir: ./pkg/${{ inputs.name }}
source: .
files: |
./docker-bake.hcl
${{ steps.meta.outputs.bake-file }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:

jobs:
prepare:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
outputs:
matrix: ${{ steps.projects.outputs.matrix }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:

jobs:
prepare:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
outputs:
matrix: ${{ steps.projects.outputs.matrix }}
steps:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ on:

jobs:
validate:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Run
uses: docker/bake-action@v4
uses: docker/bake-action@v6
with:
source: .
targets: validate
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ $ BUILDX_REF=v0.9.1 make
# build and push image to dockereng/packaging:buildx-v0.9.1 using bake.
# "release" target will use the "bin" folder as named context to create the
# image with artifacts previously built with make.
$ docker buildx bake --push --set *.tags=dockereng/packaging:buildx-v0.9.1 release
$ docker buildx bake --allow=fs=* --push --set *.tags=dockereng/packaging:buildx-v0.9.1 release
```

## Contributing
Expand Down
4 changes: 2 additions & 2 deletions common/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

define bake
$(eval $@_TMP_OUT = $(shell mktemp -d -t docker-packaging.XXXXXXXXXX))
@PKG_RELEASE=$(1) PKG_TYPE=$(PKG_TYPE) DESTDIR=$(2) docker buildx bake $(foreach platform,$(5),--set "*.platform=$(platform)") $(3) $(4) --print
PKG_RELEASE=$(1) PKG_TYPE=$(PKG_TYPE) DESTDIR=$($@_TMP_OUT) docker buildx bake $(foreach platform,$(5),--set "*.platform=$(platform)") $(3) $(4)
@PKG_RELEASE=$(1) PKG_TYPE=$(PKG_TYPE) DESTDIR=$(2) docker buildx bake --allow=fs=* $(foreach platform,$(5),--set "*.platform=$(platform)") $(3) $(4) --print
PKG_RELEASE=$(1) PKG_TYPE=$(PKG_TYPE) DESTDIR=$($@_TMP_OUT) docker buildx bake --allow=fs=* $(foreach platform,$(5),--set "*.platform=$(platform)") $(3) $(4)
mkdir -p $(2)
set -e; \
if [ "$(4)" = "pkg" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion pkg/buildx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ default: pkg ;

.PHONY: metadata
metadata:
docker buildx bake metadata
docker buildx bake --allow=fs=* metadata

include ../../common/packages.mk
include ../../common/build.mk
4 changes: 2 additions & 2 deletions pkg/buildx/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ target "_common" {
]
}

# $ PKG_RELEASE=debian11 docker buildx bake pkg
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
target "pkg" {
inherits = ["_common"]
target = "pkg"
Expand Down
2 changes: 1 addition & 1 deletion pkg/compose/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ default: pkg ;

.PHONY: metadata
metadata:
docker buildx bake metadata
docker buildx bake --allow=fs=* metadata

include ../../common/packages.mk
include ../../common/build.mk
4 changes: 2 additions & 2 deletions pkg/compose/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ target "_common" {
]
}

# $ PKG_RELEASE=debian11 docker buildx bake pkg
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
target "pkg" {
inherits = ["_common"]
target = "pkg"
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ default: pkg ;

.PHONY: metadata
metadata:
docker buildx bake metadata
docker buildx bake --allow=fs=* metadata

include ../../common/packages.mk
include ../../common/build.mk
4 changes: 2 additions & 2 deletions pkg/containerd/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ target "_common" {
]
}

# $ PKG_RELEASE=debian11 docker buildx bake pkg
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
target "pkg" {
inherits = ["_common"]
target = "pkg"
Expand Down
2 changes: 1 addition & 1 deletion pkg/credential-helpers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ default: pkg ;

.PHONY: metadata
metadata:
docker buildx bake metadata
docker buildx bake --allow=fs=* metadata

include ../../common/packages.mk
include ../../common/build.mk
4 changes: 2 additions & 2 deletions pkg/credential-helpers/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ target "_common" {
]
}

# $ PKG_RELEASE=debian11 docker buildx bake pkg
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
target "pkg" {
inherits = ["_common"]
target = "pkg"
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-cli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ default: pkg ;

.PHONY: metadata
metadata:
docker buildx bake metadata
docker buildx bake --allow=fs=* metadata

include ../../common/packages.mk
include ../../common/build.mk
4 changes: 2 additions & 2 deletions pkg/docker-cli/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ target "_common" {
]
}

# $ PKG_RELEASE=debian11 docker buildx bake pkg
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
target "pkg" {
inherits = ["_common"]
target = "pkg"
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-engine/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ default: pkg ;

.PHONY: metadata
metadata:
docker buildx bake metadata
docker buildx bake --allow=fs=* metadata

include ../../common/packages.mk
include ../../common/build.mk
4 changes: 2 additions & 2 deletions pkg/docker-engine/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ target "_common" {
]
}

# $ PKG_RELEASE=debian11 docker buildx bake pkg
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
target "pkg" {
inherits = ["_common"]
target = "pkg"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sbom/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ default: pkg ;

.PHONY: metadata
metadata:
docker buildx bake metadata
docker buildx bake --allow=fs=* metadata

include ../../common/packages.mk
include ../../common/build.mk
4 changes: 2 additions & 2 deletions pkg/sbom/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ target "_common" {
]
}

# $ PKG_RELEASE=debian11 docker buildx bake pkg
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
target "pkg" {
inherits = ["_common"]
target = "pkg"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scan/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ default: pkg ;

.PHONY: metadata
metadata:
docker buildx bake metadata
docker buildx bake --allow=fs=* metadata

include ../../common/packages.mk
include ../../common/build.mk
4 changes: 2 additions & 2 deletions pkg/scan/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ target "_common" {
]
}

# $ PKG_RELEASE=debian11 docker buildx bake pkg
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
target "pkg" {
inherits = ["_common"]
target = "pkg"
Expand Down
Loading