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.

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

Pull docker image when necessary for @QuarkusIntegrationTest #17753

Merged
merged 1 commit into from
Jun 8, 2021

Conversation

geoand
Copy link
Contributor

@geoand geoand commented Jun 8, 2021

This fixes the case where jib was used to push the container image to the registry but not build it locally

Fixes: #17730

Copy link
Contributor

@gastaldi gastaldi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just not sure why autobox the Booleans but that's not a biggie

@@ -145,8 +147,9 @@ public void buildFromNative(ContainerImageConfig containerImageConfig, JibConfig
List<ContainerImageLabelBuildItem> containerImageLabels,
BuildProducer<ArtifactResultBuildItem> artifactResultProducer) {

if (!containerImageConfig.build && !containerImageConfig.push && !buildRequest.isPresent()
&& !pushRequest.isPresent()) {
Boolean buildContainerImage = containerImageConfig.build || buildRequest.isPresent();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Boolean buildContainerImage = containerImageConfig.build || buildRequest.isPresent();
boolean buildContainerImage = containerImageConfig.build || buildRequest.isPresent();

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to use toString.

Obviously it could be done with a string concat, but I think it doesn't matter 🙂

@geoand geoand merged commit 6225430 into quarkusio:main Jun 8, 2021
@quarkus-bot quarkus-bot bot added this to the 2.1 - main milestone Jun 8, 2021
@geoand geoand deleted the #17730 branch June 8, 2021 10:46
@gsmet gsmet modified the milestones: 2.1 - main, 2.0.0.Final Jun 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

QuarkusIntegrationTest docker run, does not pull the image
3 participants