Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
5d011879
Commit
5d011879
authored
Aug 08, 2014
by
James Cammarata
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'devel' of
https://github.com/kolloch/ansible
into kolloch-devel
parents
536a5952
7a6354f7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletions
+9
-1
library/cloud/docker
+9
-1
No files found.
library/cloud/docker
View file @
5d011879
...
...
@@ -499,6 +499,13 @@ class DockerManager:
else
:
return
image
,
tag
def
get_split_full_image_tag
(
self
,
image
):
tag
=
"latest"
if
image
.
find
(
':'
)
>
0
:
return
image
.
split
(
':'
)
else
:
return
image
,
tag
def
get_summary_counters_msg
(
self
):
msg
=
""
for
k
,
v
in
self
.
counters
.
iteritems
():
...
...
@@ -598,7 +605,8 @@ class DockerManager:
try
:
containers
=
do_create
(
count
,
params
)
except
:
self
.
client
.
pull
(
params
[
'image'
])
image
,
tag
=
self
.
get_split_full_image_tag
(
params
[
'image'
])
self
.
client
.
pull
(
image
,
tag
=
tag
)
self
.
increment_counter
(
'pull'
)
containers
=
do_create
(
count
,
params
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment