Commit Graph

3158 Commits

Author SHA1 Message Date
micahhausler 1476ad302d Fixed socket for py3
* Fixed broken Dockerfile
* added .dockerignore
2014-10-28 10:26:49 -04:00
micahhausler 47baf2218f Added .version() 2014-10-27 15:13:26 -04:00
micahhausler 0e6b96a70f Added .wait() 2014-10-27 15:06:28 -04:00
micahhausler 7d0f190d0b Capitalize Docker 2014-10-27 14:56:43 -04:00
Alberto 5c06bc7f49 Added tail behaviour to logs command, same as CLI v1.3 (latest) 2014-10-27 18:31:47 +01:00
groundeffect 6a52269888 Move 'cpuset' to the end of the param list 2014-10-25 23:57:50 +02:00
micahhausler 199023c576 Added markdown docs 2014-10-24 16:55:22 -04:00
Davanum Srinivas 7a917cc7a0 Ability to specify Host Devices during container start
The command line and daemon started supporting --device
parameter during docker start a while ago in the following commit:
docker/docker@e855c4b

Since the command line looks like this,
--device=[] Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc)
This patch allows a list of strings to be passed into the start() method
and we parse out the 3 components just like in the above mentioned commit
2014-10-24 11:43:30 -04:00
Patrick Hensley b365796439 Use shlex for exec string cmd, added integration testcase. 2014-10-22 13:44:41 -04:00
Joffrey F b93fca639e Merge pull request #337 from heewa/catch_invalid_build
Catch invalid path in build method
2014-10-22 19:23:46 +02:00
Søren Gjesse a6af1b7fd4 Fix long line 2014-10-21 14:20:37 +02:00
Søren Gjesse 71b26b7167 Remove accidental changes to integration_test.py 2014-10-21 14:17:39 +02:00
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
Patrick Hensley 3ac4c78850 Updated README with description of exec. 2014-10-18 11:45:59 -04:00
Patrick Hensley e70f985b31 Fix typo in exec url. 2014-10-18 11:35:16 -04:00
Patrick Hensley d328a836fc Shorten overlong line, fix indent. 2014-10-17 16:25:33 -04:00
Patrick Hensley f95c8c4dfc Unit and integration tests for exec. 2014-10-17 16:06:14 -04:00
Patrick Hensley fce477243e Implemented exec command. 2014-10-17 16:06:01 -04: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 4d0416ac91 Add Makefile for running tests in Docker
It assumes you've got Docker running on /var/run/docker.sock, but
that should be the case on both Linux and in Boot2Docker.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-16 17:55:22 +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
Ben Firshman 695a894a53 Install test requirements in Dockerfile
Handy for running tests and so on.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-16 17:15:13 +01:00
Ben Firshman a302932c8f Use official python repository in Dockerfile
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-16 17:15:13 +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
Huayi Zhang 589e7006d5 Add support for filtering images and containers
[`filters` is a json encoded value of the filters (a map[string][string]) to process on the images list. ][1]
The tricky thing is that we must convert boolean value to string and any filter value to list to make a `map[string][string]` json format

[1]: https://docs.docker.com/reference/api/docker_remote_api_v1.14/#list-images
2014-10-05 23:18:48 +08:00
Patrick Hensley 288e53b28b Unit and integration tests for pause/unpause. 2014-10-04 23:46:33 -04:00
Patrick Hensley 75e53f1add Added pause/unpause methods. 2014-10-04 23:18:44 -04:00
Heewa Barfchin 39e19c18b8 Catch invalid path in build method
The server responds with an unuseful message (server error EOF), which
happens because an empty tar file is sent over. So check in the client,
who knows why that's happening and tell the user.
2014-10-04 18:14:23 -04:00
Alex 7e17a9acfe Remove trailing whitespace. 2014-10-04 15:41:27 +08:00
Alex 1634235005 Change remove_image to check if image is a dictionary and use Id value if it is. 2014-10-01 08:13:44 +08:00
Alex Brandt aea6bc4c93 Add tests to sdist. 2014-09-26 13:59:39 -05:00
Tom Prince 1970842666 Add tests to sdist. 2014-09-23 22:56:52 -06:00
Alexey Kotlyarov aff1fbc506 Test resource warnings when using the client 2014-09-22 16:24:23 +10:00
Alexey Kotlyarov 6a7d284a1a Clear the UNIX connection sockets properly 2014-09-22 13:19:13 +10:00
Peter Salvatore 35e6892c71 Make history() return json. 2014-09-10 23:15:57 -04: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 cd7701a31b Expand registry URL before login. 2014-09-10 10:39:57 +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