Skip to content

Commit 737f7fe

Browse files
crazy-maxcrazy-max
committed
bake: fix fs entitlement
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
1 parent f3b6dca commit 737f7fe

File tree

18 files changed

+27
-27
lines changed

18 files changed

+27
-27
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ $ BUILDX_REF=v0.9.1 make
300300
# build and push image to dockereng/packaging:buildx-v0.9.1 using bake.
301301
# "release" target will use the "bin" folder as named context to create the
302302
# image with artifacts previously built with make.
303-
$ docker buildx bake --push --set *.tags=dockereng/packaging:buildx-v0.9.1 release
303+
$ docker buildx bake --allow=fs=* --push --set *.tags=dockereng/packaging:buildx-v0.9.1 release
304304
```
305305

306306
## Contributing

‎common/build.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
define bake
1616
$(eval $@_TMP_OUT = $(shell mktemp -d -t docker-packaging.XXXXXXXXXX))
17-
@PKG_RELEASE=$(1) PKG_TYPE=$(PKG_TYPE) DESTDIR=$(2) docker buildx bake $(foreach platform,$(5),--set "*.platform=$(platform)") $(3) $(4) --print
18-
PKG_RELEASE=$(1) PKG_TYPE=$(PKG_TYPE) DESTDIR=$($@_TMP_OUT) docker buildx bake $(foreach platform,$(5),--set "*.platform=$(platform)") $(3) $(4)
17+
@PKG_RELEASE=$(1) PKG_TYPE=$(PKG_TYPE) DESTDIR=$(2) docker buildx bake --allow=fs=* $(foreach platform,$(5),--set "*.platform=$(platform)") $(3) $(4) --print
18+
PKG_RELEASE=$(1) PKG_TYPE=$(PKG_TYPE) DESTDIR=$($@_TMP_OUT) docker buildx bake --allow=fs=* $(foreach platform,$(5),--set "*.platform=$(platform)") $(3) $(4)
1919
mkdir -p $(2)
2020
set -e; \
2121
if [ "$(4)" = "pkg" ]; then \

‎pkg/buildx/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ default: pkg ;
3434

3535
.PHONY: metadata
3636
metadata:
37-
docker buildx bake metadata
37+
docker buildx bake --allow=fs=* metadata
3838

3939
include ../../common/packages.mk
4040
include ../../common/build.mk

‎pkg/buildx/docker-bake.hcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ target "_common" {
148148
]
149149
}
150150

151-
# $ PKG_RELEASE=debian11 docker buildx bake pkg
152-
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
151+
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
152+
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
153153
target "pkg" {
154154
inherits = ["_common"]
155155
target = "pkg"

‎pkg/compose/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ default: pkg ;
3434

3535
.PHONY: metadata
3636
metadata:
37-
docker buildx bake metadata
37+
docker buildx bake --allow=fs=* metadata
3838

3939
include ../../common/packages.mk
4040
include ../../common/build.mk

‎pkg/compose/docker-bake.hcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ target "_common" {
148148
]
149149
}
150150

151-
# $ PKG_RELEASE=debian11 docker buildx bake pkg
152-
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
151+
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
152+
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
153153
target "pkg" {
154154
inherits = ["_common"]
155155
target = "pkg"

‎pkg/containerd/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ default: pkg ;
4040

4141
.PHONY: metadata
4242
metadata:
43-
docker buildx bake metadata
43+
docker buildx bake --allow=fs=* metadata
4444

4545
include ../../common/packages.mk
4646
include ../../common/build.mk

‎pkg/containerd/docker-bake.hcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ target "_common" {
162162
]
163163
}
164164

165-
# $ PKG_RELEASE=debian11 docker buildx bake pkg
166-
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
165+
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
166+
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
167167
target "pkg" {
168168
inherits = ["_common"]
169169
target = "pkg"

‎pkg/credential-helpers/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ default: pkg ;
3434

3535
.PHONY: metadata
3636
metadata:
37-
docker buildx bake metadata
37+
docker buildx bake --allow=fs=* metadata
3838

3939
include ../../common/packages.mk
4040
include ../../common/build.mk

‎pkg/credential-helpers/docker-bake.hcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ target "_common" {
148148
]
149149
}
150150

151-
# $ PKG_RELEASE=debian11 docker buildx bake pkg
152-
# $ docker buildx bake --set *.platform=linux/amd64 --set *.output=./bin pkg
151+
# $ PKG_RELEASE=debian11 docker buildx bake --allow=fs=* pkg
152+
# $ docker buildx bake --allow=fs=* --set *.platform=linux/amd64 --set *.output=./bin pkg
153153
target "pkg" {
154154
inherits = ["_common"]
155155
target = "pkg"

0 commit comments

Comments
 (0)