opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-31 04:12:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch all referencs to image.ContainerConfig to image.Config

Browse Source 
This will more closely match what Docker is doing.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2018-12-18 11:44:19 -05:00
parent fe186c6ebb
commit c657dc4fdb
22 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/python/podman/podman/libs/images.py
View File

@ -41,8 +41,8 @@ class Image(collections.UserDict):
details = self.inspect()
config = ConfigDict(image_id=self._id, **kwargs)
config['command'] = details.containerconfig.get('cmd')
config['env'] = self._split_token(details.containerconfig.get('env'))
config['command'] = details.config.get('cmd')
config['env'] = self._split_token(details.config.get('env'))
config['image'] = copy.deepcopy(details.repotags[0])
config['labels'] = copy.deepcopy(details.labels)
config['net_mode'] = 'bridge'

18
contrib/python/podman/test/test_containers.py
View File

@ -140,7 +140,7 @@ class TestContainers(PodmanTestCase):
# TODO: Test for STOPSIGNAL when supported by OCI
# TODO: Test for message when supported by OCI
details = self.pclient.images.get(self.alpine_ctnr.image).inspect()
changes = ['ENV=' + i for i in details.containerconfig['env']]
changes = ['ENV=' + i for i in details.config['env']]
changes.append('CMD=/usr/bin/zsh')
changes.append('ENTRYPOINT=/bin/sh date')
changes.append('ENV=TEST=test_containers.TestContainers.test_commit')
@ -158,22 +158,22 @@ class TestContainers(PodmanTestCase):
details = img.inspect()
self.assertEqual(details.author, 'Bozo the clown')
self.assertListEqual(['/usr/bin/zsh'], details.containerconfig['cmd'])
self.assertListEqual(['/usr/bin/zsh'], details.config['cmd'])
self.assertListEqual(['/bin/sh date'],
details.containerconfig['entrypoint'])
details.config['entrypoint'])
self.assertIn('TEST=test_containers.TestContainers.test_commit',
details.containerconfig['env'])
details.config['env'])
self.assertTrue(
[e for e in details.containerconfig['env'] if 'PATH=' in e])
[e for e in details.config['env'] if 'PATH=' in e])
self.assertDictEqual({
'80': {},
'8888': {},
}, details.containerconfig['exposedports'])
}, details.config['exposedports'])
self.assertDictEqual({'unittest': 'test_commit'}, details.labels)
self.assertEqual('bozo:circus', details.containerconfig['user'])
self.assertEqual({'/data': {}}, details.containerconfig['volumes'])
self.assertEqual('bozo:circus', details.config['user'])
self.assertEqual({'/data': {}}, details.config['volumes'])
self.assertEqual('/data/application',
details.containerconfig['workingdir'])
details.config['workingdir'])
def test_remove(self):
before = len(self.containers)

2
contrib/python/podman/test/test_images.py
View File

@ -69,7 +69,7 @@ class TestImages(PodmanTestCase):
self.assertEqual(FoldedString(ctnr.status), 'running')
ctnr_details = ctnr.inspect()
for e in img_details.containerconfig['env']:
for e in img_details.config['env']:
self.assertIn(e, ctnr_details.config['env'])
def test_export(self):