mirror of
https://github.com/docker/compose.git
synced 2025-07-22 05:04:27 +02:00
Merge pull request #10062 from ndeloof/9554
load project from files when explicitly set by user
This commit is contained in:
commit
aa0720f7e5
@ -140,7 +140,7 @@ func (o *projectOptions) addProjectFlags(f *pflag.FlagSet) {
|
|||||||
func (o *projectOptions) projectOrName(services ...string) (*types.Project, string, error) {
|
func (o *projectOptions) projectOrName(services ...string) (*types.Project, string, error) {
|
||||||
name := o.ProjectName
|
name := o.ProjectName
|
||||||
var project *types.Project
|
var project *types.Project
|
||||||
if o.ProjectName == "" {
|
if len(o.ConfigPaths) > 0 || o.ProjectName == "" {
|
||||||
p, err := o.toProject(services)
|
p, err := o.toProject(services)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
envProjectName := os.Getenv("COMPOSE_PROJECT_NAME")
|
envProjectName := os.Getenv("COMPOSE_PROJECT_NAME")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user