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

BACKPORT: Inherit StopSignal from Dockerfile. #97

Merged
merged 1 commit into from Apr 12, 2016

Conversation

runcom
Copy link
Member

@runcom runcom commented Apr 12, 2016

same as #96 but for branch fedora

@rhatdan @mrunalp PTAL

Signed-off-by: Antonio Murdaca runcom@redhat.com

Upstream reference:
moby@a252516

Make sure the image configuration is not overriden by the default
value in the `create` flag.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
@rhatdan
Copy link
Member

rhatdan commented Apr 12, 2016

Antonio do we have a problem with the patches?

Makefile:97: recipe for target 'test' failed
make: **\* [test] Error 1

@runcom
Copy link
Member Author

runcom commented Apr 12, 2016

@rhatdan not sure what's happening to the CI because I can successfully fetch this branch and compile docker normally

bundles/1.10.3 already exists. Removing.

---> Making bundle: dynbinary (in bundles/1.10.3/dynbinary)
Created binary: bundles/1.10.3/dynbinary/dockerinit-1.10.3
Building: bundles/1.10.3/dynbinary/docker-1.10.3
Created binary: bundles/1.10.3/dynbinary/docker-1.10.3

ping @cevich, probably CI isn't pulling the right ref from github?

@rhatdan
Copy link
Member

rhatdan commented Apr 12, 2016

LGTM, merged on RHEL, should merge here.

@rhatdan rhatdan merged commit 84238d5 into projectatomic:fedora-1.10.3 Apr 12, 2016
@runcom runcom deleted the stopsignal-bp-fedora branch April 12, 2016 18:19
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.

None yet

2 participants