Skip to content

Commit e92c654

Browse files
committed
Added support for "status logs" returned by image build operation.
1 parent 7739807 commit e92c654

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/main/java/com/github/cowwoc/docker/internal/util/GlobParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public Predicate<Path> predicate()
256256
operation = "Excluding";
257257
else
258258
operation = "Including";
259-
log.debug("{} {} because {}, regex: {}", operation, candidateAsString, regex, why);
259+
log.debug("{} {} because {}", operation, candidateAsString, why);
260260
}
261261
return matches;
262262
};

src/main/java/com/github/cowwoc/docker/internal/util/ImageBuildListener.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.google.protobuf.InvalidProtocolBufferException;
66
import moby.buildkit.v1.ControlOuterClass.StatusResponse;
77
import moby.buildkit.v1.ControlOuterClass.Vertex;
8+
import moby.buildkit.v1.ControlOuterClass.VertexLog;
89
import moby.buildkit.v1.ControlOuterClass.VertexStatus;
910
import org.eclipse.jetty.client.Response;
1011
import org.eclipse.jetty.client.Result;
@@ -81,7 +82,6 @@ protected void processUnknownProperties(JsonNode json)
8182

8283
private void processStatus(StatusResponse status)
8384
{
84-
assert that(status.getLogsCount(), "status.getLogsCount()").isEqualTo(0).elseThrow();
8585
assert that(status.getWarningsCount(), "status.getWarningsCount()").isEqualTo(0).elseThrow();
8686

8787
for (Vertex vertex : status.getVertexesList())
@@ -93,6 +93,8 @@ private void processStatus(StatusResponse status)
9393
}
9494
for (VertexStatus vertex : status.getStatusesList())
9595
logMessage(vertex.getID(), Level.DEBUG);
96+
for (VertexLog vertex : status.getLogsList())
97+
logMessage("\t" + vertex.getMsg().toStringUtf8(), Level.DEBUG);
9698
}
9799

98100
@Override

0 commit comments

Comments
 (0)