Skip to content

Commit 5db0655

Browse files
Fix Dockerfile and add more logging
1 parent dd152cb commit 5db0655

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ENV FFMPEG_PATH=/usr/local/bin/ffmpeg
2626
COPY --from=builder /app/libwebp/bin/cwebp /usr/local/bin/
2727
COPY --from=builder /app/libwebp/bin/dwebp /usr/local/bin/
2828

29-
COPY --from=builder /app/build/jre jre
29+
COPY --from=builder /app/build/jlink/jre jre
3030
COPY --from=builder /app/build/libs/Stickerify-1.0-all.jar Stickerify.jar
3131

3232
CMD ["jre/bin/java", "-Dcom.sksamuel.scrimage.webp.binary.dir=/usr/local/bin/", "-jar", "Stickerify.jar"]

buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkTask.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public JlinkTask() {
5353
}
5454

5555
@TaskAction
56-
public void performAction() {
56+
public void createJre() {
5757
var installationPath = getJavaCompiler().get().getMetadata().getInstallationPath();
5858

5959
var jlink = installationPath.file("bin/jlink");
@@ -92,8 +92,12 @@ public void performAction() {
9292
getLogger().info(stdoutStr);
9393
}
9494

95-
if (result.getExitValue() != 0 && !stderrStr.isEmpty()) {
96-
getLogger().log(LogLevel.ERROR, stderrStr);
95+
if (result.getExitValue() != 0) {
96+
if (!stderrStr.isEmpty()) {
97+
getLogger().log(LogLevel.ERROR, stderrStr);
98+
} else {
99+
getLogger().log(LogLevel.ERROR, "jlink failed with exit code: {}", result.getExitValue());
100+
}
97101
}
98102

99103
result.assertNormalExitValue();

0 commit comments

Comments
 (0)