-
Notifications
You must be signed in to change notification settings - Fork 46
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
Imagestream naming #194
Imagestream naming #194
Conversation
81c1b6e
to
d2c65b1
Compare
The thing I'm not sure about is whether we want to limit osbs-client to Dockerfiles that have |
I've made a separate pull request for the |
I'll remove the commit from this PR, then. (Just for reference, the commit is now in PR #195). |
d2c65b1
to
de9a382
Compare
Just a note: the BuildConfigs and ImageStreams are both tracking the same units, so they ought to use the same names as each other. |
de9a382
to
3766b12
Compare
Done, should be ready for merge. |
self.dj.dock_json_set_arg('postbuild_plugins', 'import_image', 'docker_image_repo', | ||
self.spec.imagestream_url.value) | ||
self.dj.dock_json_set_arg('postbuild_plugins', 'import_image', 'url', | ||
self.spec.openshift_uri.value) |
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 think we also want to set use_auth
here, don't we? cf. line 182 further up.
"url": "{{OPENSHIFT_URI}}", | ||
"verify_ssl": false | ||
}, | ||
"name": "import_image" |
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.
Does the simple build type get all the rebuild trigger bits? Maybe that should only be in the prod type.
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.
Hmm, not sure. I guess this really depends on how we define simple builds. I'm fine with only having triggers for prod builds, if others agree.
- set 'use_auth' argument for 'import_image' plugin - replace '/' by '-' in all imagestream names - rename autorebuild bits from simple build json (also see #202)
I added a commit that addresses issues found in previous commits. Everything should be fine now. |
Good catch. I'll just do a force push to not introduce a new commit... |
- set 'use_auth' argument for 'import_image' plugin - replace '/' by '-' in all imagestream names - rename autorebuild bits from simple build json (also see #202)
1eadc61
to
2dc530f
Compare
LGTM |
This PR makes sure we get three things right:
imagestream
argument forImportImagePlugin
docker_image_repo
argument forImportImagePlugin
Also, the second commit fixes minor issue, where openshift url for
check_and_set_rebuild
wasn't previously substituted inBuildRequest
.