Merge pull request #280 from jzelinskie/updateACI
update to ACI spec 0.6.1
This commit is contained in:
commit
6805670aaa
1 changed files with 18 additions and 10 deletions
|
@ -33,26 +33,34 @@ class ACIImage(TarImageFormatter):
|
|||
def _isolate_memory(memory):
|
||||
return {
|
||||
"name": "memory/limit",
|
||||
"value": str(memory) + 'B'
|
||||
"value": {
|
||||
"request": str(memory) + 'B',
|
||||
}
|
||||
}
|
||||
|
||||
def _isolate_swap(memory):
|
||||
return {
|
||||
"name": "memory/swap",
|
||||
"value": str(memory) + 'B'
|
||||
"value": {
|
||||
"request": str(memory) + 'B',
|
||||
}
|
||||
}
|
||||
|
||||
def _isolate_cpu(cpu):
|
||||
return {
|
||||
"name": "cpu/shares",
|
||||
"value": str(cpu)
|
||||
"value": {
|
||||
"request": str(cpu),
|
||||
}
|
||||
}
|
||||
|
||||
def _isolate_capabilities(capabilities_set_value):
|
||||
capabilities_set = re.split(r'[\s,]', capabilities_set_value)
|
||||
return {
|
||||
"name": "capabilities/bounding-set",
|
||||
"value": ' '.join(capabilities_set)
|
||||
"name": "os/linux/capabilities-retain-set",
|
||||
"value": {
|
||||
"set": capabilities_set,
|
||||
}
|
||||
}
|
||||
|
||||
mappers = {
|
||||
|
@ -95,7 +103,7 @@ class ACIImage(TarImageFormatter):
|
|||
ports.append({
|
||||
"name": "port-%s" % port_number,
|
||||
"port": port_number,
|
||||
"protocol": protocol
|
||||
"protocol": protocol,
|
||||
})
|
||||
except ValueError:
|
||||
pass
|
||||
|
@ -126,7 +134,7 @@ class ACIImage(TarImageFormatter):
|
|||
volumes.append({
|
||||
"name": get_name(docker_volume_path),
|
||||
"path": docker_volume_path,
|
||||
"readOnly": False
|
||||
"readOnly": False,
|
||||
})
|
||||
return volumes
|
||||
|
||||
|
@ -154,12 +162,12 @@ class ACIImage(TarImageFormatter):
|
|||
|
||||
manifest = {
|
||||
"acKind": "ImageManifest",
|
||||
"acVersion": "0.2.0",
|
||||
"name": '%s/%s/%s/%s' % (hostname, namespace, repository, tag),
|
||||
"acVersion": "0.6.1",
|
||||
"name": '%s/%s/%s/' % (hostname, namespace, repository),
|
||||
"labels": [
|
||||
{
|
||||
"name": "version",
|
||||
"value": "1.0.0"
|
||||
"value": tag,
|
||||
},
|
||||
{
|
||||
"name": "arch",
|
||||
|
|
Reference in a new issue