Skip to content

Fix ImageId retrieval (search from the end of the list of build-infos) #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2021
Merged

Fix ImageId retrieval (search from the end of the list of build-infos) #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ImageApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,19 +270,20 @@ class ImageApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, pro
}

fun getImageId(buildInfos: List<BuildInfo>): ImageID? {
val firstAux = buildInfos.stream()
val reversedInfos = buildInfos.reversed()
val firstAux = reversedInfos.stream()
.filter { (_, _, _, _, _, _, _, aux): BuildInfo -> aux != null }
.findFirst()
if (firstAux.isPresent) {
return firstAux.get().aux
} else {
val idFromStream = buildInfos.stream()
val idFromStream = reversedInfos.stream()
.filter { (_, stream): BuildInfo -> stream?.contains("Successfully built ")!! }
.findFirst()
return if (idFromStream.isPresent) {
ImageID(idFromStream.get().stream!!.removePrefix("Successfully built ").replaceAfter('\n', "").trim())
} else {
val tagFromStream = buildInfos.stream()
val tagFromStream = reversedInfos.stream()
.filter { (_, stream): BuildInfo -> stream?.contains("Successfully tagged ")!! }
.findFirst()
tagFromStream.map { (_, stream): BuildInfo ->
Expand Down
2 changes: 2 additions & 0 deletions api-client/src/test/java/de/gesellix/docker/remote/api/client/ImageApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public void setup() {
public void getImageIdFromAux() {
List<BuildInfo> infos = new ArrayList<>();
infos.add(new BuildInfo(null, null, null, null, null, null, null, new ImageID("sha256:expected-id")));
infos.add(new BuildInfo(null, "Successfully built the wind\ncaught it", null, null, null, null, null, null));
infos.add(new BuildInfo(null, "Successfully built f9d5f290d048\nfoo bar", null, null, null, null, null, null));
infos.add(new BuildInfo(null, "Successfully tagged image:tag\nbar baz", null, null, null, null, null, null));

Expand All @@ -35,6 +36,7 @@ public void getImageIdFromAux() {
@Test
public void getImageIdFromStreamWithBuildMessage() {
List<BuildInfo> infos = new ArrayList<>();
infos.add(new BuildInfo(null, "Successfully built the wind\ncaught it", null, null, null, null, null, null));
infos.add(new BuildInfo(null, "Successfully built f9d5f290d048\nfoo bar", null, null, null, null, null, null));
infos.add(new BuildInfo(null, "Successfully tagged image:tag\nbar baz", null, null, null, null, null, null));

Expand Down