Skip to content

Conversation

bluikko
Copy link
Contributor

@bluikko bluikko commented Feb 22, 2019

This is my ridiculous attempt to address the requests listed in #2201 - since the original submitter has not addressed the three very simple requests by @chris-crone in over 2 months, I decided to take a stab on it.

It is my first attempt with Python and was done very quickly - the changes requested in #2201 were very simple but the kwargs might have been my stumbling block... it has been not tested.

Barry Shapira and others added 6 commits December 11, 2018 22:06
…net size.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
Also corrected a documentation error: the default API version from
constants is currently 1.35, not 1.30 as was sometimes listed.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
The integration tests require restarting the swarm once for each
test.  I had done so manually with self.init_swarm(force_new_cluster=True)
but that wasn't resetting the swarm state correctly.  The usual
test teardown procedure cleans up correctly.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "2200-swarm-default-addr-pool-reviewed" git@github.com:bluikko/docker-py.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842353560464
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

"""

url = self._url('/swarm/init')

Copy link
Contributor

Choose a reason for hiding this comment

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

nit: Remove empty line

Copy link
Contributor

@ulyssessouza ulyssessouza left a comment

Choose a reason for hiding this comment

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

Could you please squash the commits b7d93f6 and 6e21b83 ?
Since the second is just a correction of the first...

Also squash the commits 59d0a8b and a210c31.

And also, you need to sign your commits. Check the message from @GordonTheTurtle :D

@hannseman
Copy link
Contributor

@bluikko are you still interested in resolving the requested changes here? Otherwise I can open up a new one. It would be nice to get this feature implemented.

@bluikko
Copy link
Contributor Author

bluikko commented Mar 22, 2019

Indeed it would be a good feature - I made the PR very quickly with plain github, thinking it would be easy (right...). I'm not sure I could squash the commits with github only.

I actually gave up trying to manage Docker Swarm with docker-py since the project I am working on has some scheduling pressures.

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants