Commit graph

33 commits

Author SHA1 Message Date
Chris Houseknecht
58b551774c Add push parameter. Let API handle registry authentication check. 2016-07-12 16:49:58 -04:00
Chris Houseknecht
73dbb744b5 Merge pull request #3887 from Jorge-Rodriguez/docker-image-no-push-on-load
Don't forcibly push loaded images to registry.
2016-07-12 13:09:33 -04:00
Stefan Hajnoczi
47cc422b8a Stream image data in load_image() to avoid out-of-memory
Reading the entire tar file into memory can result in out-of-memory
conditions such as this traceback:

Traceback (most recent call last):
  File "/tmp/ansible_YELTSu/ansible_module_docker_image.py", line 486, in load_image
    self.client.load_image(image_data)
  File "/usr/local/lib/python2.7/dist-packages/docker/api/image.py", line 147, in load_image
    res = self._post(self._url("/images/load"), data=data)
  ...
  File "/usr/lib/python2.7/httplib.py", line 997, in endheaders
    self._send_output(message_body)
  File "/usr/lib/python2.7/httplib.py", line 848, in _send_output
    msg += message_body
MemoryError

Luckily docker-py's load_image(), which calls requests post(), accepts a
file-like object instead of a string.  Pass in the file object to avoid
reading the full file into memory.  This allows larger tar files to load
succesfully.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
2016-06-08 23:50:44 +01:00
Rodríguez, Jorge
7d33c6ccdf Do not forcibly push when building, either. 2016-06-08 11:45:39 +03:00
Rodríguez, Jorge
a0be466f90 Don't forcibly push loaded images to registry. Fixes #3763 2016-06-08 11:43:27 +03:00
chouseknecht
d63bc38481
Fail gracefully when build path is not found. 2016-05-13 00:30:36 -04:00
chouseknecht
a9ab2e1142
Add doc string for container_limits. Fixed push fail message. Use path type. 2016-04-29 00:39:08 -04:00
chouseknecht
1d2be97013 Updated version_added on options to reflect options added for 2.1. 2016-04-25 15:22:44 -04:00
chouseknecht
e888abbcb0
Clean up and fixes post API version 1.20 testing. 2016-04-25 15:12:28 -04:00
chouseknecht
6eba1d6fb3 Fix github credentials 2016-04-25 15:11:48 -04:00
chouseknecht
009b02e928 Fix unfriendly exeption handling. 2016-04-25 15:11:48 -04:00
chouseknecht
39fdd2358e Updater per PR comments 2016-04-25 15:11:48 -04:00
chouseknecht
7a1eea2767 Adding refactored docker_image module. 2016-04-25 15:11:48 -04:00
Andrey Gubarev
45b3066c81 update docker_image's path param type to 'path'. Fixes #3175 2016-03-03 02:27:39 +03:00
Daniel Petty
bf04a0fe0e replaced sudo with become 2016-02-18 08:00:27 -07:00
Toshio Kuratomi
e318be30ff Fix issues version_added and chaged => changed typo 2015-11-02 10:49:24 -08:00
Michael Schuett
80c2e28a48 Fix message
Previous fix did not actual work. This fix does however.
2015-11-02 10:49:24 -08:00
Michael Schuett
b0357bf9e8 Handle connection error
Try and help when mac hits a connection error.
2015-11-02 10:49:24 -08:00
Michael Schuett
1dcb31cad6 remove .geturl()
Can't call geturl on a string.
2015-11-02 10:49:24 -08:00
Michael Schuett
c126498899 Remove faulty logic
Update logic after splitting the error into two separate messages.
2015-11-02 10:49:24 -08:00
Michael Schuett
1e8d20b0da Documentation Fix
Updated documentation to match current module state.
2015-11-02 10:49:24 -08:00
Michael Schuett
0a5b7087bd Improve Message
Give user a course of action in the case where the suggestions do not
work. This will hopefully allow us to work through any further issues
much faster.
2015-11-02 10:49:24 -08:00
Michael Schuett
addbc329be Improve Error Reporting
This will hopefully help mac users be able to quickly resolve any issues
they may find when trying to use this module.
2015-11-02 10:49:24 -08:00
Michael Schuett
bf5929d32a docker_image TLS
Check commit enables using tls when using the docker_image module. It
also removes the default for docker_url which doesn't allow us to check
for DOCKER_HOST which is a more sane default. This allows you to use
docker_image on OSX but more documentation is needed.
2015-11-02 10:49:24 -08:00
Toshio Kuratomi
1001eae3c8 Set a default value for DEFAULT_DOCKER_API_VERSION so we can create the AnsibleModule without docker-py 2015-08-03 08:44:48 -07:00
Greg DeKoenigsberg
28a869a030 Updating cloud modules with proper github author information 2015-06-15 14:41:22 -04:00
Andrew Pashkin
27c174128b Add 'docker_api_version' to docker_image
By default docker-py uses latest version of Docker API. This is not
always desireable, and this patch adds option to specify version, that
should be used.
2015-05-23 23:17:30 +03:00
Pierre Baillet
06e3ac7bf4 Support optional dockerfile name 2015-05-18 16:51:12 +02:00
Toshio Kuratomi
60a66a544d Several cleanups to many modules:
* Fix docs to specify when python2.6+ is required (due to a library
  dep).  This helps us know when it is okay to use python2.6+ syntax in
  the file.
* remove BabyJson returns.  See #1211  This commit fixes all but the
  openstack modules.
* Use if __name__ == '__main__' to only run the main part of the module
  if the module is run as a program.  This allows for the potential to
  unittest the code later.
2015-05-11 12:15:53 -07:00
Brian Coca
a811b9f12e removed deprecated docs, not true anymore 2015-04-28 16:48:28 -04:00
Brian Coca
d2158708ff undeprecated docker_image until replacement actually arives 2015-02-23 12:43:10 -05:00
Michael DeHaan
2970b339eb Deprecate docker_image, use the docker module to deploy docker images, or shell out to docker to call
docker build if you want from a playbook.
2014-11-05 16:13:55 -05:00
Brian Coca
0c4adcb2c6 made subcategories for cloud modules for better organization 2014-11-04 11:18:09 -05:00
Renamed from cloud/docker_image.py (Browse further)