Merge pull request #634 from ulyssessouza/remove-redundant-envfile

Remove redundant envfile

Author: Ulysses Souza

Gopkg.lock

@@ -37,7 +37,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/docker/cli"
-  branch = "19.03"
+  revision = "83751b978155dc889c35e0e49654f76e7cf8d951"
 
 [[override]]
   name = "github.com/deislabs/cnab-go"

Gopkg.toml

@@ -20,7 +20,5 @@ services:
       COMPANY: mycompany
       SOME_FILE: /some/file
       USER: myuser
-    env_file:
-    - myvars.env
     image: busybox:1.30.1`})
 }

e2e/envfile_test.go

@@ -102,7 +102,7 @@ func render(appPath string, composeContent string, imageMap map[string]bundle.Im
 	rendered, err := loader.Load(composetypes.ConfigDetails{
 		WorkingDir:  appPath,
 		ConfigFiles: configFiles,
-	})
+	}, loader.WithDiscardEnvFiles)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to load Compose file")
 	}