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 stop-signal in stack command #388

Merged
merged 1 commit into from
Aug 1, 2017

Conversation

christopherobin
Copy link
Contributor

- What I did

Fixes #370 by passing StopSignal to the container spec when doing a deploy.

- How I did it

Passed StopSignal and removed stop_signal from unsupported keys.

- How to verify it

Create a small docker-compose file with a service defining a stop signal, deploy using docker stack deploy -c file.yml stack_name then inspect one of the created containers.

- Description for the changelog

Added support for stop_signal when deploying a compose file through docker stack.

- A picture of a cute animal (not mandatory but encouraged)

otter_madness

@codecov-io
Copy link

codecov-io commented Jul 27, 2017

Codecov Report

Merging #388 into master will decrease coverage by 0.34%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master     #388      +/-   ##
==========================================
- Coverage   46.14%   45.79%   -0.35%     
==========================================
  Files         193      193              
  Lines       16073    16070       -3     
==========================================
- Hits         7417     7360      -57     
- Misses       8269     8324      +55     
+ Partials      387      386       -1

Copy link
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

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

LGTM

@docker docker deleted a comment from GordonTheTurtle Aug 1, 2017
Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

@vdemeester vdemeester merged commit f386d47 into docker:master Aug 1, 2017
@GordonTheTurtle GordonTheTurtle added this to the 17.08.0 milestone Aug 1, 2017
@christopherobin christopherobin deleted the feature/stopsignal branch August 1, 2017 09:31
@thaJeztah
Copy link
Member

ping @londoncalling to verify if this needs docs updates

@londoncalling
Copy link
Contributor

londoncalling commented Aug 2, 2017

@thaJeztah , it looks like we have this in the Compose file reference, but currently say it's ignored by docker stack deploy: https://docs.docker.com/compose/compose-file/#stop_signal

Is the first part of this docs update to remove the caveat here re: docker stack deploy (as it's now supported)? And update the versioning information?

Regarding Compose CLI support, I assume this warrants a new Compose CLI command topic?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants