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

Add support for custom image labels #601

Merged
merged 1 commit into from
Oct 7, 2016

Conversation

mmilata
Copy link
Contributor

@mmilata mmilata commented Oct 3, 2016

Needed for https://trello.com/c/HB9IwGj5/925-5-add-arbitrary-labels-to-docker-images

Work in progress because we probably need to discuss how the API should look like in order to support autogenerated values (e.g. SCM commit hash) in the future.

@bparees
Copy link
Contributor

bparees commented Oct 3, 2016

looks reasonable to me. i don't think s2i should be concerned w/ the autogeneration aspect, we should handle that in origin and just set explicit label values in the s2i config object when invoking s2i.

@mmilata
Copy link
Contributor Author

mmilata commented Oct 4, 2016

@bparees I was thinking that some of the generated labels may have to be generated on the s2i side because openshift doesn't have the cloned repository. Now I see that cloning is done in openshift code so it shouldn't be a problem to access all the information about a repository.

Should I extend this PR with a means to disable the label generation as currently implemented in s2i or is it out of scope of the trello card?

@bparees
Copy link
Contributor

bparees commented Oct 4, 2016

Out of scope. We need to leave that in place anyway for compatibility for
now.

Ben Parees | OpenShift

On Oct 4, 2016 6:24 AM, "Martin Milata" notifications@github.com wrote:

@bparees https://github.com/bparees I was thinking that some of the
generated labels may have to be generated on the s2i side because openshift
doesn't have the cloned repository. Now I see that cloning is done in
openshift code so it shouldn't be a problem to access all the information
about a repository.

Should I extend this PR with a means to disable the label generation as
currently implemented in s2i or is it out of scope of the trello card?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#601 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AEvl3uPcw1e9tVuoCmWbPjZjnI_7GVKTks5qwilKgaJpZM4KM0r5
.

@mmilata mmilata changed the title [WIP] Add support for custom image labels Add support for custom image labels Oct 4, 2016
@mfojtik
Copy link
Contributor

mfojtik commented Oct 4, 2016

LGTM, good job with adding more tests :-)

@mfojtik
Copy link
Contributor

mfojtik commented Oct 7, 2016

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for source to image merge up to e3d70cb

@openshift-bot
Copy link
Contributor

openshift-bot commented Oct 7, 2016

Source To Image Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_sti/251/)

@openshift-bot openshift-bot merged commit 2a7f4c4 into openshift:master Oct 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants