docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dotcloud/docker-py

This commit is contained in:
shin- 2013-06-21 19:56:54 +02:00
parent ada06bd56d 4f748a9d3f
commit 3ffef6dd04
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/__init__.py
View File

@ -1 +1 @@
from client import Client from .client import Client

4
docker/client.py
View File

@ -355,9 +355,9 @@ class BuilderClient(object):
self.config['Image'] = self.image self.config['Image'] = self.image
if id is None: if id is None:
cmd = self.config['Cmd'] cmd = self.config['Cmd']
self.config.Cmd = ['true'] self.config['Cmd'] = ['true']
id = self.run() id = self.run()
self.config.Cmd = cmd self.config['Cmd'] = cmd
res = self.client.commit(id, author=self.maintainer) res = self.client.commit(id, author=self.maintainer)
if 'Id' not in res: if 'Id' not in res: