Skip to content

Commit 29b77ea

Browse files
committed
bake: use sanitize func
Signed-off-by: CrazyMax <[email protected]>
1 parent aa706f6 commit 29b77ea

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

docker-bake.hcl

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ variable "BUILDX_TARGET" {
3131
default = "binaries"
3232
}
3333

34-
# https://github.com/docker/buildx/blob/8411a763d99274c7585553f0354a7fdd0df679eb/bake/bake.go#L35
35-
# TODO: use sanitize func once buildx 0.17.0 is released https://github.com/docker/buildx/pull/2649
36-
function "sanitize_target" {
37-
params = [in]
38-
result = regex_replace(in, "[^a-zA-Z0-9_-]+", "-")
39-
}
40-
4134
function "parse_refs" {
4235
params = [refs]
4336
result = [
@@ -95,7 +88,7 @@ target "_common" {
9588

9689
target "buildkit-build" {
9790
inherits = ["_common"]
98-
name = "buildkit-build-${sanitize_target(ref)}"
91+
name = "buildkit-build-${sanitize(ref)}"
9992
matrix = {
10093
ref = [for item in parse_refs(BUILDKIT_REFS) : item.value]
10194
}
@@ -107,20 +100,20 @@ target "buildkit-build" {
107100

108101
target "buildkit-binaries" {
109102
contexts = { for ref in parse_refs(BUILDKIT_REFS) :
110-
format("buildkit-build-%s", sanitize_target(ref.value)) => format("target:buildkit-build-%s", sanitize_target(ref.value))
103+
format("buildkit-build-%s", sanitize(ref.value)) => format("target:buildkit-build-%s", sanitize(ref.value))
111104
}
112105
dockerfile-inline = <<EOT
113106
FROM scratch
114107
${join("\n", [for ref in parse_refs(BUILDKIT_REFS) :
115-
format("COPY --link --from=buildkit-build-%s / /%s", sanitize_target(ref.value), ref.key)
108+
format("COPY --link --from=buildkit-build-%s / /%s", sanitize(ref.value), ref.key)
116109
])}
117110
EOT
118111
output = ["type=cacheonly"]
119112
}
120113

121114
target "buildx-build" {
122115
inherits = ["_common"]
123-
name = "buildx-build-${sanitize_target(ref)}"
116+
name = "buildx-build-${sanitize(ref)}"
124117
matrix = {
125118
ref = [for item in parse_refs(BUILDX_REFS) : item.value]
126119
}
@@ -132,12 +125,12 @@ target "buildx-build" {
132125

133126
target "buildx-binaries" {
134127
contexts = { for ref in parse_refs(BUILDX_REFS) :
135-
format("buildx-build-%s", sanitize_target(ref.value)) => format("target:buildx-build-%s", sanitize_target(ref.value))
128+
format("buildx-build-%s", sanitize(ref.value)) => format("target:buildx-build-%s", sanitize(ref.value))
136129
}
137130
dockerfile-inline = <<EOT
138131
FROM scratch
139132
${join("\n", [for ref in parse_refs(BUILDX_REFS) :
140-
format("COPY --link --from=buildx-build-%s / /%s", sanitize_target(ref.value), ref.key)
133+
format("COPY --link --from=buildx-build-%s / /%s", sanitize(ref.value), ref.key)
141134
])}
142135
EOT
143136
output = ["type=cacheonly"]

0 commit comments

Comments
 (0)