tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-25 14:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10657 from ndeloof/compose_project_name

Browse Source 
don't skip `compose` used as project name
This commit is contained in:
Guillaume Lours 2023-06-07 08:26:21 +02:00 committed by GitHub
commit e21a8d6293
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/compatibility/convert.go
View File

@ -62,10 +62,6 @@ func Convert(args []string) []string {
continue continue
} }
if len(arg) > 0 && arg[0] != '-' { if len(arg) > 0 && arg[0] != '-' {
// not a top-level flag anymore, keep the rest of the command unmodified
if arg == compose.PluginName {
i++
}
command = append(command, args[i:]...) command = append(command, args[i:]...)
break break
} }

5
cmd/compatibility/convert_test.go
View File

@ -83,6 +83,11 @@ func Test_convert(t *testing.T) {
args: []string{"--project-directory", "", "ps"}, args: []string{"--project-directory", "", "ps"},
want: []string{"compose", "--project-directory", "", "ps"}, want: []string{"compose", "--project-directory", "", "ps"},
}, },
{
name: "compose as project name",
args: []string{"--project-name", "compose", "down", "--remove-orphans"},
want: []string{"compose", "--project-name", "compose", "down", "--remove-orphans"},
},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {