Søren Gjesse
60edfe84b8
Add directories to the Docker context
...
This change adds both files and directories to the tra-file for the
Docker context. Previously only files where added.
The context will now also contain empty directoryes and symlinks
to directories.
2014-10-21 14:01:57 +02:00
John Costa
d26428b633
Merge pull request #356 from bfirsh/ship-0.5.3
...
Ship 0.5.3
2014-10-16 13:41:16 -04:00
John Costa
d68984dcbc
Merge pull request #355 from bfirsh/fix-attaching-to-unix-sockets
...
Fix attaching with UNIX sockets
2014-10-16 13:41:08 -04:00
Ben Firshman
5323c14ba8
Ship 0.5.3
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-16 18:03:52 +01:00
Ben Firshman
537b468140
Fix attaching with UNIX sockets
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-16 17:25:21 +01:00
Sam Alba
721edfd526
Merge pull request #353 from bfirsh/ship-0.5.2
...
Ship 0.5.2
2014-10-16 07:54:23 -07:00
Sam Alba
91b1a93100
Merge pull request #352 from bfirsh/fix-tls-sockets-being-closed-when-attaching
...
Stop TLS sockets being closed when attaching
2014-10-16 07:54:01 -07:00
Ben Firshman
bb5e1fd365
Ship 0.5.2
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-16 14:14:58 +01:00
Ben Firshman
7625d08c55
Stop TLS sockets being closed when attaching
...
When calling attach_socket, the response is garbage collected,
which triggers a close method on the file object, closing the socket.
This stop the response from being garbage collected until we've
finished with the underlying socket.
Fixes #350
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-16 12:30:36 +01:00
Sam Alba
a22ee2a97b
Merge pull request #349 from bfirsh/ship-0.5.1
...
Ship 0.5.1
2014-10-14 09:29:28 -07:00
Sam Alba
ff1f11b143
Merge pull request #347 from aanand/override-assert-hostname
...
Enable the overriding of `assert_hostname` on TLSConfig
2014-10-14 09:28:37 -07:00
Ben Firshman
04db8e5c85
Ship 0.5.1
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-14 17:10:52 +01:00
Aanand Prasad
4bf438d7b8
Enable the overriding of `assert_hostname` on TLSConfig
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-10-14 12:04:46 +01:00
Aanand Prasad
7db976c1e3
Fix typos in ssladapter.py
...
- Check that `urllib_ver` is not None, instead of `urllib3`
- Do version comparison only if `urllib_ver` is *not* "dev"
Fixes #325 . Original work by @sidprak.
2014-10-14 12:04:46 +01:00
Joffrey F
7a46297085
Merge pull request #316 from Precis/socket_wrapper
...
Wrap response socket for platform compatibility.
2014-09-10 18:23:18 +02:00
Matthias Erll
b5f08141e6
Renamed wrapper.
2014-09-09 08:52:02 +02:00
Matthias Erll
e134e89682
Wrap response socket for platform compatibility.
2014-09-09 08:41:10 +02:00
Joffrey F
24b8d668ab
Switch back to dev version
2014-09-08 18:25:09 +02:00
Joffrey F
1c754fbedb
Bumped version and updated Changelog
2014-09-08 17:38:42 +02:00
Joffrey F
d9f1b250fd
Simplified init_poolmanager
2014-09-08 17:22:49 +02:00
Joffrey F
ff8c9bb5fd
Fixed integration tests
2014-09-08 17:22:32 +02:00
Joffrey F
3fc69abdbf
Merge pull request #298 from docker/insecure_registry
...
Don't fallback to HTTP unless insecure_registry is specified when pushing/pulling
2014-09-08 17:04:52 +02:00
Joffrey F
5452670b99
Merge pull request #314 from mantiz/add-support-to-add-or-drop-capabilities
...
add support to add or drop capabilities
2014-09-05 14:06:10 +02:00
Christian Hammerl
9523950829
add support to add or drop capabilities
2014-09-04 23:15:47 +02:00
Joffrey F
e6af420aeb
Merge pull request #304 from shreyu86/dev-restart-policy
...
Restart Policy for Containers Implemented fixes #302
2014-08-28 20:13:39 +02:00
Shreyas Karnik
7479d4cd29
added documentation for restart policy
2014-08-28 12:33:28 -05:00
Shreyas Karnik
a1168c894a
removed DeprecationWarning @shin-
2014-08-28 11:58:41 -05:00
Shreyas Karnik
c6046ac137
first cut of restart policy
2014-08-26 21:35:04 -05:00
Joffrey F
be831c1130
Don't fallback to HTTP unless insecure_registry is specified when pushing/pulling
2014-08-22 17:28:59 +02:00
Joffrey F
c76fd8d914
Merge branch 'cameronmaske-push-tags'
2014-08-22 17:09:05 +02:00
Joffrey F
9999cb0663
pep8 fix
2014-08-22 17:08:57 +02:00
Cameron Maske
5800c4ab06
Allow pushing a single tag.
...
Closes #282
2014-08-22 10:14:51 -04:00
Joffrey F
710f3725b6
Version back to x-dev
2014-08-22 13:48:01 +02:00
Joffrey F
7dde830e6e
Merge branch 'ifraixedes-patch-1'
2014-08-22 13:26:25 +02:00
Joffrey F
24eb16c33a
Amended create_container documentation
2014-08-22 13:26:03 +02:00
Joffrey F
dba1c45454
Merge pull request #291 from yograterol/master
...
Volumes parameter on create_container should be validated as string
2014-08-22 13:12:41 +02:00
Yohan Graterol
23a57c29ad
Change str type for six.string_types to py3 compatibility
2014-08-20 10:28:56 -05:00
Joffrey F
15b22e7d16
Merge pull request #292 from mpetazzoni/stop-timeout
...
Stop timeout should be added to the request timeout
2014-08-20 14:32:10 +02:00
Maxime Petazzoni
97366f6b60
Stop timeout should be added to the request timeout
...
Using the max of the stop timeout and request timeout did not entirely
make sure that a stop timeout greater than a request timeout wouldn't
fail prematurely with a HTTPTimeout exception. The correct behavior is
to add the timeouts together, as the stop timeout is understood to be
part of the "request processing time". Any transport-level timeout thus
comes in addition to that.
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
2014-08-19 10:37:54 -07:00
Yohan Graterol
28e27eb81a
Create test for volume as string
2014-08-17 02:42:35 -05:00
Yohan Graterol
10b11a3f98
Remove unicode type in isinstance
2014-08-17 02:33:38 -05:00
Yohan Graterol
0a2940a8f0
Validation for volumes parameters as string in _container_config
2014-08-17 02:27:00 -05:00
Yohan Graterol
80b3688e81
PEP8 compliance - space between numbers and operators
2014-08-17 02:24:22 -05:00
Yohan Graterol
75c7931f3d
Added validation for volumes parameter - Issue #276
2014-08-17 02:23:32 -05:00
Joffrey F
698732636c
Merge pull request #287 from leonidlm/feature/adding-memory-limit-string-support
...
Adding units specification to mem_limit variable
2014-08-08 21:00:16 +02:00
Joffrey F
f2ea67badb
Merge pull request #288 from dnephin/unpin_deps
...
Don't use pinned dependencies
2014-08-08 20:58:27 +02:00
Daniel Nephin
59c6d5c586
Resolves #101 , don't use pinned dependencies.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-08-08 11:10:26 -04:00
Leonid Mirsky
98a4aa994c
Adding tests for mem_limit string conversion + adding default unit
2014-08-05 22:02:02 +03:00
Leonid Mirsky
18f2b6ff91
Fixing styling issues
2014-08-05 15:47:02 +03:00
Leonid Mirsky
e5edaf4e0b
Adding value verifications for mem_limit string representation
2014-08-05 15:36:06 +03:00