cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated version_added on options to reflect options added for 2.1.

Browse source
This commit is contained in:
chouseknecht 2016-04-25 15:17:48 -04:00
parent e888abbcb0
commit 1d2be97013
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cloud/docker/docker_image.py
View file

@ -35,6 +35,7 @@ options:
- Use with state 'present' to archive an image to a .tar file. - Use with state 'present' to archive an image to a .tar file.
required: false required: false
default: null default: null
version_added: "2.1"
dockerfile: dockerfile:
description: description:
- Use with state 'present' to provide an alternate name for the Dockerfile to use when building an image. - Use with state 'present' to provide an alternate name for the Dockerfile to use when building an image.
@ -45,12 +46,14 @@ options:
- Use with absent state to un-tag and remove all images matching the specified name. Use with states 'present' - Use with absent state to un-tag and remove all images matching the specified name. Use with states 'present'
and 'tagged' to take action even when an image already exists. and 'tagged' to take action even when an image already exists.
default: false default: false
version_added: "2.1"
http_timeout: http_timeout:
description: description:
- Timeout for HTTP requests during the image build operation. Provide a positive integer value for the number of - Timeout for HTTP requests during the image build operation. Provide a positive integer value for the number of
seconds. seconds.
default: null default: null
required: false required: false
version_added: "2.1"
name: name:
description: description:
- "Image name. Name format will be one of: name, repository/name, registry_server:port/name. - "Image name. Name format will be one of: name, repository/name, registry_server:port/name.
@ -68,10 +71,12 @@ options:
description: description:
- When building an image downloads any updates to the FROM image in Dockerfile. - When building an image downloads any updates to the FROM image in Dockerfile.
default: true default: true
version_added: "2.1"
rm: rm:
description: description:
- Remove intermediate containers after build. - Remove intermediate containers after build.
default: true default: true
version_added: "2.1"
nocache: nocache:
description: description:
- Do not use cache when building an image. - Do not use cache when building an image.
@ -81,6 +86,7 @@ options:
- Full path to a repository. Use with state 'present' to tag the image into the repository. - Full path to a repository. Use with state 'present' to tag the image into the repository.
required: false required: false
default: null default: null
version_added: "2.1"
state: state:
description: description:
- Make assertions about the state of an image. - Make assertions about the state of an image.
@ -417,7 +423,6 @@ class ImageManager(DockerBaseClass):
:return: image dict :return: image dict
''' '''
self.push = True
params = dict( params = dict(
path=self.path, path=self.path,
tag=self.name, tag=self.name,