Skip to content

Commit 004d36f

Browse files
allisaurusallisaurus
committed
Merge branch 'compose3' into dev, adding docker Compose version 3 support
2 parents 3d66863 + fe79364 commit 004d36f

Some content is hidden

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

67 files changed

+10559
-2018
lines changed

‎ecs-cli/Gopkg.lock

Lines changed: 139 additions & 13 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: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
[[constraint]]
7171
name = "github.com/stretchr/testify"
72-
revision = "2402e8e7a02fc811447d11f881aa9746cdc57983"
72+
version = "1.2.1"
7373

7474
[[constraint]]
7575
name = "github.com/urfave/cli"
@@ -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/adapter/containerconfig.go

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package adapter
2+
3+
import "github.com/aws/aws-sdk-go/service/ecs"
4+
5+
// ContainerConfig all compose fields supported by the ecs-cli
6+
type ContainerConfig struct {
7+
Name string
8+
9+
CapAdd []string
10+
CapDrop []string
11+
Command []string
12+
CPU int64
13+
DNSSearchDomains []string
14+
DNSServers []string
15+
DockerLabels map[string]*string
16+
DockerSecurityOptions []string
17+
Entrypoint []string
18+
Environment []*ecs.KeyValuePair
19+
ExtraHosts []*ecs.HostEntry
20+
Hostname string
21+
Image string
22+
Links []string
23+
LogConfiguration *ecs.LogConfiguration
24+
Memory int64
25+
MemoryReservation int64
26+
MountPoints []*ecs.MountPoint
27+
PortMappings []*ecs.PortMapping
28+
Privileged bool
29+
ReadOnly bool
30+
ShmSize int64
31+
Tmpfs []*ecs.Tmpfs
32+
Ulimits []*ecs.Ulimit
33+
VolumesFrom []*ecs.VolumeFrom
34+
User string
35+
WorkingDirectory string
36+
}

0 commit comments

Comments
 (0)