docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 09:17:49 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1018 from tonistiigi/v0.8-compose-target-dot

Browse Source 
[v0.8] bake: allow dot in target names for compose
This commit is contained in:
Tõnis Tiigi 2022-03-20 19:23:58 -07:00 committed by GitHub
commit 5fac64c2c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bake/bake.go
View File

@ -28,8 +28,10 @@ var (
httpPrefix = regexp.MustCompile(`^https?://`) httpPrefix = regexp.MustCompile(`^https?://`)
gitURLPathWithFragmentSuffix = regexp.MustCompile(`\.git(?:#.+)?$`) gitURLPathWithFragmentSuffix = regexp.MustCompile(`\.git(?:#.+)?$`)
validTargetNameChars = `[a-zA-Z0-9_-]+` validTargetNameChars = `[a-zA-Z0-9_-]+`
targetNamePattern = regexp.MustCompile(`^` + validTargetNameChars + `$`) validTargetNameCharsCompose = `[a-zA-Z0-9._-]+`
targetNamePattern = regexp.MustCompile(`^` + validTargetNameChars + `$`)
targetNamePatternCompose = regexp.MustCompile(`^` + validTargetNameCharsCompose + `$`)
) )
type File struct { type File struct {
@ -968,6 +970,13 @@ func validateTargetName(name string) error {
return nil return nil
} }
func validateTargetNameCompose(name string) error {
if !targetNamePatternCompose.MatchString(name) {
return errors.Errorf("only %q are allowed", validTargetNameCharsCompose)
}
return nil
}
func sliceEqual(s1, s2 []string) bool { func sliceEqual(s1, s2 []string) bool {
if len(s1) != len(s2) { if len(s1) != len(s2) {
return false return false

2
bake/compose.go
View File

@ -60,7 +60,7 @@ func ParseCompose(dt []byte) (*Config, error) {
continue continue
} }
if err = validateTargetName(s.Name); err != nil { if err = validateTargetNameCompose(s.Name); err != nil {
return nil, errors.Wrapf(err, "invalid service name %q", s.Name) return nil, errors.Wrapf(err, "invalid service name %q", s.Name)
} }

4
bake/compose_test.go
View File

@ -330,6 +330,10 @@ func TestServiceName(t *testing.T) {
}, },
{ {
svc: "a.b", svc: "a.b",
wantErr: false,
},
{
svc: "a?b",
wantErr: true, wantErr: true,
}, },
{ {