vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Handle capabilities strings with both spaces and commas (since Docker doesn't have this documented yet)

Browse source
This commit is contained in:
Joseph Schorr 2015-01-16 17:29:59 -05:00
parent 5bbf1d0c14
commit e902cd62fd
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
formats/aci.py
View file

@ -3,6 +3,7 @@ from util.streamlayerformat import StreamLayerMerger
from formats.tarimageformatter import TarImageFormatter from formats.tarimageformatter import TarImageFormatter
import json import json
import re
class ACIImage(TarImageFormatter): class ACIImage(TarImageFormatter):
""" Image formatter which produces an ACI-compatible TAR. """ Image formatter which produces an ACI-compatible TAR.
@ -46,10 +47,11 @@ class ACIImage(TarImageFormatter):
"value": str(cpu) "value": str(cpu)
} }
def _isolate_capabilities(capabilities_set): def _isolate_capabilities(capabilities_set_value):
capabilities_set = re.split(r'[\s,]', capabilities_set_value)
return { return {
"name": "capabilities/bounding-set", "name": "capabilities/bounding-set",
"value": str(capabilities_set) "value": ' '.join(capabilities_set)
} }
mappers = { mappers = {