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

Merge pull request #280 from jzelinskie/updateACI

Browse source 
update to ACI spec 0.6.1
This commit is contained in:
Jimmy Zelinskie 2015-07-28 15:49:12 -04:00
commit 6805670aaa
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
formats/aci.py
View file

@ -33,26 +33,34 @@ class ACIImage(TarImageFormatter):
def _isolate_memory(memory): def _isolate_memory(memory):
return { return {
"name": "memory/limit", "name": "memory/limit",
"value": str(memory) + 'B' "value": {
"request": str(memory) + 'B',
}
} }
def _isolate_swap(memory): def _isolate_swap(memory):
return { return {
"name": "memory/swap", "name": "memory/swap",
"value": str(memory) + 'B' "value": {
"request": str(memory) + 'B',
}
} }
def _isolate_cpu(cpu): def _isolate_cpu(cpu):
return { return {
"name": "cpu/shares", "name": "cpu/shares",
"value": str(cpu) "value": {
"request": str(cpu),
}
} }
def _isolate_capabilities(capabilities_set_value): def _isolate_capabilities(capabilities_set_value):
capabilities_set = re.split(r'[\s,]', capabilities_set_value) capabilities_set = re.split(r'[\s,]', capabilities_set_value)
return { return {
"name": "capabilities/bounding-set", "name": "os/linux/capabilities-retain-set",
"value": ' '.join(capabilities_set) "value": {
"set": capabilities_set,
}
} }
mappers = { mappers = {
@ -95,7 +103,7 @@ class ACIImage(TarImageFormatter):
ports.append({ ports.append({
"name": "port-%s" % port_number, "name": "port-%s" % port_number,
"port": port_number, "port": port_number,
"protocol": protocol "protocol": protocol,
}) })
except ValueError: except ValueError:
pass pass
@ -126,7 +134,7 @@ class ACIImage(TarImageFormatter):
volumes.append({ volumes.append({
"name": get_name(docker_volume_path), "name": get_name(docker_volume_path),
"path": docker_volume_path, "path": docker_volume_path,
"readOnly": False "readOnly": False,
}) })
return volumes return volumes
@ -154,12 +162,12 @@ class ACIImage(TarImageFormatter):
manifest = { manifest = {
"acKind": "ImageManifest", "acKind": "ImageManifest",
"acVersion": "0.2.0", "acVersion": "0.6.1",
"name": '%s/%s/%s/%s' % (hostname, namespace, repository, tag), "name": '%s/%s/%s/' % (hostname, namespace, repository),
"labels": [ "labels": [
{ {
"name": "version", "name": "version",
"value": "1.0.0" "value": tag,
}, },
{ {
"name": "arch", "name": "arch",