block s2i from doing ONBUILD operations#8679
Conversation
|
@smarterclayton @mfojtik ptal (@mfojtik need you to review the env var change i had to make when bumping s2i) |
bparees
force-pushed
the
s2i-edae41b-bump
branch
from
2f44276 to
9170ddb
Compare
|
Looks ok to me but will defer to Michal on sign off |
bparees
force-pushed
the
s2i-edae41b-bump
branch
from
9170ddb to
3fa1e1a
Compare
bparees
force-pushed
the
s2i-edae41b-bump
branch
from
3fa1e1a to
5751f9a
Compare
pkg/build/builder/sti.go
Outdated
| envVars := s2iapi.EnvironmentList{} | ||
| for _, item := range bi { | ||
| envVars[item.Key] = item.Value | ||
| envVars = append(envVars, s2iapi.EnvironmentSpec{Name: item.Key, Value: item.Value}) |
There was a problem hiding this comment.
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
force-pushed
the
s2i-edae41b-bump
branch
from
5751f9a to
94146b5
Compare
|
@mfojtik updated per your suggestion, ptal |
|
manually tested env var behavior. [merge] |
|
LGTM
|
bparees
force-pushed
the
s2i-edae41b-bump
branch
from
94146b5 to
ed5723d
Compare
|
[test] |
|
@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). |
|
[testonlyextended][extended:core(s2i build with environment file in sources)] |
|
Evaluated for origin testonlyextended up to ed5723d |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/3471/) |
|
Evaluated for origin test up to ed5723d |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/3471/) (Image: devenv-rhel7_4062) |
|
Evaluated for origin merge up to ed5723d |
|
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)) |
4 participants
No description provided.