tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #222 from ulyssessouza/inspect 

Fix linter
This commit is contained in:
Guillaume Tardif 2020-06-16 11:48:35 +02:00 committed by GitHub
parent 2b4e2cb322 5b1522095b
commit 13d3a52273
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
azure/convert/convert.go
View File

@ -228,6 +228,7 @@ func (s serviceConfigAciHelper) getAciContainer(volumesCache map[string]bool) (c
}
// ContainerGroupToContainer composes a Container from an ACI container definition
func ContainerGroupToContainer(containerID string, cg containerinstance.ContainerGroup, cc containerinstance.Container) (containers.Container, error) {
memLimits := -1.
if cc.Resources != nil &&

3
cli/cmd/inspect.go
View File

@ -37,6 +37,9 @@ func runInspect(ctx context.Context, id string) error {
}
b, err := json.MarshalIndent(container, "", " ")
if err != nil {
return err
}
containerString := string(b)
fmt.Println(containerString)

3
tests/e2e/e2e_test.go
View File

@ -202,8 +202,7 @@ func (s *E2eSuite) TestMockBackend() {
})
It("can run inspect command on container", func() {
golden.Assert(s.T(), s.NewDockerCommand("inspect", "id").ExecOrDie(),
GoldenFile("inspect-id"))
golden.Assert(s.T(), s.NewDockerCommand("inspect", "id").ExecOrDie(), "inspect-id")
})
It("can run 'run' command", func() {