Skip to content

Commit 032527b

Browse files
allisaurusallisaurus
committed
Update docker/cli to 1872bd80
1 parent 6e726b5 commit 032527b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+13247
-2
lines changed

‎ecs-cli/Gopkg.lock

Lines changed: 20 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ecs-cli/Gopkg.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,7 @@
7979
[[constraint]]
8080
name = "gopkg.in/yaml.v2"
8181
revision = "a5b47d31c556af34a302ce5d659e6fea44d90de0"
82+
83+
[[constraint]]
84+
name = "github.com/docker/cli"
85+
revision = "1872bd802c697f39eb783a9b7d25e60d6fe601d6"

‎ecs-cli/modules/cli/compose/project/project_parseV3.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,28 @@ package project
33
import (
44
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/containerconfig"
55
"github.com/sirupsen/logrus"
6+
7+
"github.com/docker/cli/cli/compose/loader"
8+
"github.com/docker/cli/cli/compose/types"
69
)
710

811
func (p *ecsProject) parseV3() (*[]containerconfig.ContainerConfig, error) {
912
logrus.Debug("Parsing v3 project...")
1013

1114
// TODO: parse v3, convert ServiceConfigs to ContainerConfigs
15+
configDetails := types.ConfigDetails{}
16+
config, err := loader.Load(configDetails)
17+
if err != nil {
18+
return nil, err
19+
}
20+
21+
for _, service := range config.Services {
22+
convertDockerToContainerConfig(service)
23+
}
24+
1225
return &[]containerconfig.ContainerConfig{}, nil
1326
}
27+
28+
func convertDockerToContainerConfig(serviceConfig types.ServiceConfig) {
29+
return
30+
}

‎ecs-cli/vendor/github.com/docker/cli/cli/cobra.go

Lines changed: 162 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)