-
Notifications
You must be signed in to change notification settings - Fork 32
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
Inline Containerfile generation #2119
Conversation
docker build . -t quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:dev | ||
docker push quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:dev | ||
docker build . -t quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:"$${JBS_QUAY_IMAGE_TAG:-dev}" | ||
docker push quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:"$${JBS_QUAY_IMAGE_TAG:-dev}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unless the JBS_QUAY_IMAGE_TAG is specified we default to dev
. With Tekton pipelines, if tag is latest
the it will use PullAlways. Hence for pipelines setting JBS_QUAY_IMAGE_TAG=latest
is advised. We should consider whether to change the default to latest
(perhaps in another iteration).
@@ -103,7 +106,7 @@ spec: | |||
memory: 512Mi | |||
script: | | |||
$(params.BUILD_SCRIPT) | |||
/opt/jboss/container/java/run/run-java.sh $(params.PREPROCESSOR_ARGS) | |||
/opt/jboss/container/java/run/run-java.sh $(params.BUILD_TOOL)-prepare $(workspaces.source.path)/source --recipe-image=$(params.RECIPE_IMAGE) --request-processor-image=$(params.JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE) --disabled-plugins=$(params.BUILD_PLUGINS) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This completely inlines the request processor arguments (which makes it easier for PNC to use)
} catch (IOException e) { | ||
Log.errorf("Unable to write Containerfile", e); | ||
throw new RuntimeException(e); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This inlines the Containerfile generation into the source directory for the next steps (the git archiving and image generation) in the task to use.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2119 +/- ##
============================================
+ Coverage 39.71% 39.77% +0.05%
- Complexity 812 813 +1
============================================
Files 301 301
Lines 14034 14028 -6
Branches 1468 1469 +1
============================================
+ Hits 5573 5579 +6
+ Misses 7823 7814 -9
+ Partials 638 635 -3 ☔ View full report in Codecov by Sentry. |
/lgtm |
This moves Containerfile generation from the operator to the Java request-processor (specifically the preprocessor step) so it can be reused outside of JBS.