Skip to content

block s2i from doing ONBUILD operations #8679

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

Merged
merged 2 commits into from
Apr 29, 2016

Conversation

bparees
Copy link
Contributor

@bparees bparees commented Apr 29, 2016

No description provided.

@bparees
Copy link
Contributor Author

bparees commented Apr 29, 2016

@smarterclayton @mfojtik ptal (@mfojtik need you to review the env var change i had to make when bumping s2i)

@smarterclayton
Copy link
Contributor

Looks ok to me but will defer to Michal on sign off

for _, item := range bi {
envVars[item.Key] = item.Value
envVars = append(envVars, s2iapi.EnvironmentSpec{Name: item.Key, Value: item.Value})
Copy link
Contributor

Choose a reason for hiding this comment

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

you can also use err = envVars.Set("KEY=VALUE") to make sure the checks for the format/etc apply, but append will work as well.

@bparees
Copy link
Contributor Author

bparees commented Apr 29, 2016

@mfojtik updated per your suggestion, ptal

@bparees
Copy link
Contributor Author

bparees commented Apr 29, 2016

manually tested env var behavior. [merge]

@mfojtik
Copy link
Contributor

mfojtik commented Apr 29, 2016

LGTM
On Apr 29, 2016 19:20, "OpenShift Bot" [email protected] wrote:

continuous-integration/openshift-jenkins/merge Evaluating for testing


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#8679 (comment)

@bparees
Copy link
Contributor Author

bparees commented Apr 29, 2016

[test]
[merge]

@bparees
Copy link
Contributor Author

bparees commented Apr 29, 2016

@smarterclayton @mfojtik @jwforres i ended up doing the bump here because i was going to have to update origin code (as this PR does) to make it compatible w/ the bump i was having to do to revert the change(sigh).

@bparees
Copy link
Contributor Author

bparees commented Apr 29, 2016

[testonlyextended][extended:core(s2i build with environment file in sources)]

@openshift-bot
Copy link
Contributor

Evaluated for origin testonlyextended up to ed5723d

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/3471/)

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to ed5723d

@openshift-bot
Copy link
Contributor

openshift-bot commented Apr 29, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/3471/) (Image: devenv-rhel7_4062)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to ed5723d

@openshift-bot openshift-bot merged commit 21fcb38 into openshift:master Apr 29, 2016
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/testonlyextended SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin_extended/129/) (Extended Tests: core(s2i build with environment file in sources))

@bparees bparees deleted the s2i-edae41b-bump branch May 2, 2016 19:49
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