Skip to content

Conversation

shin-
Copy link
Contributor

@shin- shin- commented Mar 11, 2016

Fixes #984 (?)

Signed-off-by: Joffrey F <joffrey@docker.com>
@keloyang
Copy link

I have a try and #984 is fixed.thank you.

self.assertFalse(kwargs['tls'].verify)
except TypeError as e:
self.fail(e)
self.assertEqual('tcp://192.168.59.103:2376', kwargs['base_url'])
Copy link
Contributor

Choose a reason for hiding this comment

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

From this test change it's not clear to me what the expected behaviour is supposed to be.

It seems like we're reverting part of the recent change, is that right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. I tested that case locally with the docker CLI, and setting DOCKER_TLS_VERIFY to empty string and DOCKER_HOST to a TCP address let me connect to an unsecured daemon, so I believe this change is correct.

@dnephin
Copy link
Contributor

dnephin commented Mar 14, 2016

LGTM

@GordonTheTurtle
Copy link

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

$ git clone -b "tls-fixes" git@github.com:docker/docker-py.git somewhere
$ cd somewhere
$ git rebase -i HEAD~2
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

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

1 similar comment
@GordonTheTurtle
Copy link

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

$ git clone -b "tls-fixes" git@github.com:docker/docker-py.git somewhere
$ cd somewhere
$ git rebase -i HEAD~2
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

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

shin- added a commit that referenced this pull request Mar 15, 2016
@shin- shin- merged commit 7befe69 into master Mar 15, 2016
@shin- shin- deleted the tls-fixes branch March 23, 2016 20:48
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.

4 participants