Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,7 @@ private JibContainerBuilder createContainerBuilderFromNative(ContainerImageJibCo
.setEnvironment(createEnvironmentVariables(jibConfig))
.setLabels(allLabels(jibConfig, containerImageConfig, containerImageLabels));

includeSharedObjects(jibContainerBuilder, nativeImageBuildItem, workDirInContainer);
mayInheritEntrypoint(jibContainerBuilder, entrypoint, jibConfig.nativeArguments().orElse(null));

if (jibConfig.useCurrentTimestamp()) {
Expand All @@ -821,6 +822,26 @@ private JibContainerBuilder createContainerBuilderFromNative(ContainerImageJibCo
}
}

private void includeSharedObjects(JibContainerBuilder jibContainerBuilder, NativeImageBuildItem nativeImageBuildItem,
AbsoluteUnixPath workDirInContainer) {
Path buildDir = nativeImageBuildItem.getPath().getParent();
try (Stream<Path> paths = Files.list(buildDir)) {
List<Path> sharedObjectFiles = paths.filter(Files::isRegularFile).filter(p -> !Files.isDirectory(p))
.filter(p -> p.getFileName().toString().endsWith(".so")).toList();
if (!sharedObjectFiles.isEmpty()) {
FileEntriesLayer.Builder fileEntriesLayerBuilder = FileEntriesLayer.builder();
sharedObjectFiles.forEach(sharedObjectFile -> {
fileEntriesLayerBuilder.addEntry(sharedObjectFile,
workDirInContainer.resolve(sharedObjectFile.getFileName().toString()),
FilePermissions.fromOctalString("775"));
});
jibContainerBuilder.addFileEntriesLayer(fileEntriesLayerBuilder.setName("shared objects").build());
}
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}

private Map<String, String> createEnvironmentVariables(ContainerImageJibConfig jibConfig) {
Map<String, String> original = jibConfig.environmentVariables();
if (original.isEmpty()) {
Expand Down
Loading