8000 Merge pull request #607 from tucksaun/chore/docker-deprecations · symfony-cli/symfony-cli@594009a · GitHub
[go: up one dir, main page]

Skip to content

Commit 594009a

Browse files
authored
Merge pull request #607 from tucksaun/chore/docker-deprecations
chore: fix Docker Deprecations
2 parents 1dce4a5 + e62ce3e commit 594009a

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

envs/docker.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636

3737
compose "github.com/compose-spec/compose-go/cli"
3838
composeConsts "github.com/compose-spec/compose-go/consts"
39-
"github.com/docker/docker/api/types"
4039
"github.com/docker/docker/api/types/container"
4140
docker "github.com/docker/docker/client"
4241
"github.com/symfony-cli/terminal"
@@ -53,7 +52,7 @@ func ComputeDockerUserAgent(appName, appVersion string) {
5352
dockerUserAgent = fmt.Sprintf("Docker-Client/%s %s/%s", dockerClientVersion, appName, appVersion)
5453
}
5554

56-
type sortedPorts []types.Port
55+
type sortedPorts []container.Port
5756

5857
func (ps sortedPorts) Len() int { return len(ps) }
5958
func (ps sortedPorts) Swap(i, j int) { ps[i], ps[j] = ps[j], ps[i] }
@@ -148,7 +147,7 @@ func (l *Local) RelationshipsFromDocker() Relationships {
148147
return relationships
149148
}
150149

151-
func (l *Local) dockerServiceToRelationship(client *docker.Client, container types.Container) map[string]map[string]interface{} {
150+
func (l *Local) dockerServiceToRelationship(client *docker.Client, container container.Summary) map[string]map[string]interface{} {
152151
if l.Debug {
153152
fmt.Fprintf(os.Stderr, `found Docker container "%s" for project "%s" (image "%s")`+"\n", container.Labels["com.docker.compose.service"], container.Labels["com.docker.compose.project"], container.Image)
154153
}

0 commit comments

Comments
 (0)
0