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

Jump to bottom

[release-1.0] Fix env handling on exec #1187

Merged
merged 4 commits into from Nov 30, 2017
Merged

[release-1.0] Fix env handling on exec #1187

merged 4 commits into from Nov 30, 2017

Conversation

runcom
Copy link
Member

@runcom runcom commented Nov 30, 2017

same as #1186 but for release-1.0

@runcom runcom requested a review from mrunalp as a code owner November 30, 2017 09:48
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 30, 2017
@runcom runcom changed the title [release-1.0] Fix env handling [release-1.0] Fix env handling on exec Nov 30, 2017
@runcom
container_exec: use process file with runc exec
3a36f55 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
@runcom
oci: do not append conmon env to container process
e447061 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 30, 2017
@runcom
container_create: correctly set image and kube envs
cc0f78d 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
@runcom
Copy link
Member Author

runcom commented Nov 30, 2017

/test all

@runcom
test: add exec/execsync env conflict test
762cb4c 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
@runcom
Copy link
Member Author

runcom commented Nov 30, 2017

/test all

@TomSweeneyRedHat
Copy link
Contributor

LGTM

mrunalp
mrunalp approved these changes Nov 30, 2017
View reviewed changes
Copy link
Member

@mrunalp mrunalp left a comment

Choose a reason for hiding this comment

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

LGTM

@mrunalp mrunalp merged commit eb8df95 into cri-o:release-1.0 Nov 30, 2017
@runcom runcom mentioned this pull request Nov 30, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrunalp mrunalp mrunalp approved these changes

Assignees
No one assigned
Labels
size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@runcom @TomSweeneyRedHat @mrunalp @k8s-ci-robot