Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fallback to finding docker image name from compose ps

Browse Source 
Earlier versions of docker do not include the image name in the inspect
output. We now fallback to using the `compose ps` response.

Closes gh-34993
This commit is contained in:
Phillip Webb
2023-04-15 18:37:25 -07:00
parent 24d1620a93
commit efff253d35
2 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DefaultRunningService.java
View File

@@ -45,11 +45,12 @@ class DefaultRunningService implements RunningService, OriginProvider {
private DockerEnv env;
DefaultRunningService(DockerHost host, DockerComposeFile composeFile, DockerCliComposePsResponse psResponse,
DefaultRunningService(DockerHost host, DockerComposeFile composeFile, DockerCliComposePsResponse composePsResponse,
DockerCliInspectResponse inspectResponse) {
this.origin = new DockerComposeOrigin(composeFile, psResponse.name());
this.name = psResponse.name();
this.image = ImageReference.of(psResponse.image());
this.origin = new DockerComposeOrigin(composeFile, composePsResponse.name());
this.name = composePsResponse.name();
this.image = ImageReference
.of((composePsResponse.image() != null) ? composePsResponse.image() : inspectResponse.config().image());
this.host = host;
this.ports = new DefaultConnectionPorts(inspectResponse);
this.env = new DockerEnv(inspectResponse.config().env());