Skip to content

Commit

Permalink
Expanding the manifest capabilities to include
Browse files Browse the repository at this point in the history
ports forwarding as well as docker network type
configuration
  • Loading branch information
azmyali98 committed Aug 28, 2023
1 parent 7f8779d commit 68e11a4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
2 changes: 2 additions & 0 deletions sonic_package_manager/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ def unmarshal(self, value):
ManifestRoot('container', [
ManifestField('privileged', DefaultMarshaller(bool), False),
ManifestArray('volumes', DefaultMarshaller(str)),
ManifestField('network', DefaultMarshaller(str), 'host'),
ManifestArray('ports', DefaultMarshaller(str)),
ManifestArray('mounts', ManifestRoot('mounts', [
ManifestField('source', DefaultMarshaller(str)),
ManifestField('target', DefaultMarshaller(str)),
Expand Down
7 changes: 7 additions & 0 deletions sonic_package_manager/service_creator/creator.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,13 @@ def generate_container_mgmt(self, package: Package):

run_opt.append('-t')

if container_spec['network']:
docker_network_type = container_spec['network']
run_opt.append(f'--net={docker_network_type}')

for port in container_spec['ports']:
run_opt.append(f'--publish {port}')

for volume in container_spec['volumes']:
run_opt.append(f'-v {volume}')

Expand Down
4 changes: 4 additions & 0 deletions tests/sonic_package_manager/test_service_creator.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ def manifest():
},
'container': {
'privileged': True,
'network': 'bridge',
'ports': [
"8080:8080"
],
'volumes': [
'/etc/sonic:/etc/sonic:ro'
]
Expand Down

0 comments on commit 68e11a4

Please sign in to comment.