Skip to content
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

Use the proper config values when pulling base image for native build using Jib #19780

Merged
merged 1 commit into from
Aug 30, 2021
+4 −4
Merged

Use the proper config values when pulling base image for native build using Jib #19780

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
8 changes: 4 additions & 4 deletions ...-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void buildFromNative(ContainerImageConfig containerImageConfig, JibConfig
"The native binary produced by the build is not a Linux binary and therefore cannot be used in a Linux container image. Consider adding \"quarkus.native.container-build=true\" to your configuration");
}

JibContainerBuilder jibContainerBuilder = createContainerBuilderFromNative(containerImageConfig, jibConfig,
JibContainerBuilder jibContainerBuilder = createContainerBuilderFromNative(jibConfig,
nativeImage, containerImageLabels);
setUser(jibConfig, jibContainerBuilder);
setPlatforms(jibConfig, jibContainerBuilder);
Expand Down Expand Up @@ -517,7 +517,7 @@ private JibContainerBuilder createContainerBuilderFromLegacyJar(JibConfig jibCon
}
}

private JibContainerBuilder createContainerBuilderFromNative(ContainerImageConfig containerImageConfig, JibConfig jibConfig,
private JibContainerBuilder createContainerBuilderFromNative(JibConfig jibConfig,
NativeImageBuildItem nativeImageBuildItem, List<ContainerImageLabelBuildItem> containerImageLabels) {

List<String> entrypoint;
Expand All @@ -532,8 +532,8 @@ private JibContainerBuilder createContainerBuilderFromNative(ContainerImageConfi
try {
AbsoluteUnixPath workDirInContainer = AbsoluteUnixPath.get("/work");
JibContainerBuilder jibContainerBuilder = Jib
.from(toRegistryImage(ImageReference.parse(jibConfig.baseNativeImage), containerImageConfig.username,
containerImageConfig.password))
.from(toRegistryImage(ImageReference.parse(jibConfig.baseNativeImage), jibConfig.baseRegistryUsername,
jibConfig.baseRegistryPassword))
.addFileEntriesLayer(FileEntriesLayer.builder()
.addEntry(nativeImageBuildItem.getPath(), workDirInContainer.resolve(BINARY_NAME_IN_CONTAINER),
FilePermissions.fromOctalString("775"))
Expand Down