-
Notifications
You must be signed in to change notification settings - Fork 151
Replace mikefarah/yq with kislyuk/yq #205
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
Conversation
Dockerfile.rhel
Outdated
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.
Do we use this file? Why not delete it? Maybe we rename Dockerfile to Dockerfile.alpine, and rename Dockerfile.rhel to Dockerfile so it's the default one used? (Yes, this can be done in another commit.)
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.
I'll create an issue for moving to ubi8, I don't think alpine is necessary, moreso convenient.
The only concern would be due to the difference in image size, since the broker has to be pulled for every workspace start, but I wonder how much of an issue this would actually be considering it would probably be cached pretty quickly.
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.
Ah nevermind I see you've beat me to the punch: eclipse-che/che#14113
I'd do it as a separate PR as I don't think it's a simple drop-in replacement.
|
Rebased on master, fixed the shellcheck issue (can't put anything after a directive it seems), and removed an errant paste in the schema. |
|
Relaxed the validation requirement for version numbers to include "number", since the version for |
|
Rebased on master to resolve merge conflict. |
Signed-off-by: Angel Misevski <[email protected]>
Instead of using the golang-based version of yq, use the Python jq wrapper, also named yq. Also updates plugin schema validation to use jsonschema, and adds a meta.yaml.schema file. Signed-off-by: Angel Misevski <[email protected]>
|
+1 for this solution. Make it sew, number one. https://1188277.v1.pressablecdn.com/wp-content/uploads/2018/08/Make-it-Sew.jpg |
What does this PR do?
Replaces
mikefarah/yqwithkislyuk/yqand reworks scripts to accomodate this change:meta.yamls for required fields, usesjsonschemato validate against a schema filecheck_plugins_images.shscriptindex.shscript is greatly simplified due to the capabilities ofyqyqin a loop is tremendously slowutil.sh), I'm usinggrepinstead ofyq(replacing this function withyqadds ~30 seconds to the build time). This could fail if any of the fields are not on the same lineyqdoesn't support in-place editing:latestUpdateDate, we usesedto append a line to each file.latestUpdateDatefield is for, since it's discarded by the plugin broker