@@ -31,13 +31,6 @@ variable "BUILDX_TARGET" {
31
31
default = " binaries"
32
32
}
33
33
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
-
41
34
function "parse_refs" {
42
35
params = [refs ]
43
36
result = [
@@ -95,7 +88,7 @@ target "_common" {
95
88
96
89
target "buildkit-build" {
97
90
inherits = [" _common" ]
98
- name = " buildkit-build-${ sanitize_target (ref)} "
91
+ name = " buildkit-build-${ sanitize (ref)} "
99
92
matrix = {
100
93
ref = [for item in parse_refs (BUILDKIT_REFS) : item . value ]
101
94
}
@@ -107,20 +100,20 @@ target "buildkit-build" {
107
100
108
101
target "buildkit-binaries" {
109
102
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 ))
111
104
}
112
105
dockerfile-inline = << EOT
113
106
FROM scratch
114
107
${ 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 )
116
109
])}
117
110
EOT
118
111
output = [" type=cacheonly" ]
119
112
}
120
113
121
114
target "buildx-build" {
122
115
inherits = [" _common" ]
123
- name = " buildx-build-${ sanitize_target (ref)} "
116
+ name = " buildx-build-${ sanitize (ref)} "
124
117
matrix = {
125
118
ref = [for item in parse_refs (BUILDX_REFS) : item . value ]
126
119
}
@@ -132,12 +125,12 @@ target "buildx-build" {
132
125
133
126
target "buildx-binaries" {
134
127
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 ))
136
129
}
137
130
dockerfile-inline = << EOT
138
131
FROM scratch
139
132
${ 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 )
141
134
])}
142
135
EOT
143
136
output = [" type=cacheonly" ]
0 commit comments