Handle capabilities strings with both spaces and commas (since Docker doesn't have this documented yet)
This commit is contained in:
parent
5bbf1d0c14
commit
e902cd62fd
1 changed files with 4 additions and 2 deletions
|
@ -3,6 +3,7 @@ from util.streamlayerformat import StreamLayerMerger
|
|||
from formats.tarimageformatter import TarImageFormatter
|
||||
|
||||
import json
|
||||
import re
|
||||
|
||||
class ACIImage(TarImageFormatter):
|
||||
""" Image formatter which produces an ACI-compatible TAR.
|
||||
|
@ -46,10 +47,11 @@ class ACIImage(TarImageFormatter):
|
|||
"value": str(cpu)
|
||||
}
|
||||
|
||||
def _isolate_capabilities(capabilities_set):
|
||||
def _isolate_capabilities(capabilities_set_value):
|
||||
capabilities_set = re.split(r'[\s,]', capabilities_set_value)
|
||||
return {
|
||||
"name": "capabilities/bounding-set",
|
||||
"value": str(capabilities_set)
|
||||
"value": ' '.join(capabilities_set)
|
||||
}
|
||||
|
||||
mappers = {
|
||||
|
|
Reference in a new issue