Merge pull request #6921 from derekwaynecarr/fix_example

Docker requires a minimum amount of memory for container
This commit is contained in:
Eric Tune 2015-04-16 13:27:48 -07:00
commit cbb1108b73
4 changed files with 8 additions and 8 deletions

View File

@ -11,7 +11,7 @@
"cpu": "2"
},
"min": {
"memory": "1048576",
"memory": "5242880",
"cpu": "0.25"
}
},
@ -22,11 +22,11 @@
"cpu": "2"
},
"min": {
"memory": "1048576",
"memory": "5242880",
"cpu": "0.25"
},
"default": {
"memory": "1048576",
"memory": "5242880",
"cpu": "0.25"
}
}

View File

@ -13,7 +13,7 @@
"cpu": "2"
},
"min": {
"memory": "1Mi",
"memory": "5Mi",
"cpu": "250m"
}
},
@ -24,11 +24,11 @@
"cpu": "2"
},
"min": {
"memory": "1Mi",
"memory": "5Mi",
"cpu": "250m"
},
"default": {
"memory": "1Mi",
"memory": "5Mi",
"cpu": "250m"
}
}

View File

@ -14,7 +14,7 @@
"resources": {
"limits": {
"cpu": "1",
"memory": "1Mi"
"memory": "5Mi"
}
}
}]

View File

@ -13,7 +13,7 @@
"name": "kubernetes-serve-hostname",
"image": "gcr.io/google_containers/serve_hostname",
"cpu": 1000,
"memory": 1048576
"memory": 5242880
}]
}
}