Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix examples to set manifest ID and version #314

Merged
merged 1 commit into from
Jul 1, 2014
Merged

Fix examples to set manifest ID and version #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/examples/controller.json
View file
Open in desktop
Expand Up @@ -6,6 +6,8 @@
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "nginxController",
"containers": [{
"name": "nginx",
"image": "dockerfile/nginx",
Expand Down
6 changes: 5 additions & 1 deletion api/examples/pod-list.json
View file
Open in desktop
Expand Up @@ -8,6 +8,8 @@
},
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "my-pod-1",
"containers": [{
"image": "dockerfile/nginx",
"ports": [{
Expand All @@ -29,6 +31,8 @@
},
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "my-pod-2",
"containers": [{
"image": "dockerfile/nginx",
"ports": [{
Expand All @@ -43,4 +47,4 @@
}
}
]
}
}
2 changes: 2 additions & 0 deletions api/examples/pod.json
View file
Open in desktop
Expand Up @@ -2,6 +2,8 @@
"id": "php",
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "php",
"containers": [{
"image": "dockerfile/nginx",
"ports": [{
Expand Down
2 changes: 1 addition & 1 deletion cmd/integration/integration.go
View file
Open in desktop
Expand Up @@ -160,7 +160,7 @@ containers:
image: dockerfile/redis
volumeMounts:
- name: redis-data
path: /data
mountPath: /data

- name: guestbook
image: google/guestbook-python-redis
Expand Down
2 changes: 2 additions & 0 deletions examples/guestbook/frontend-controller.json
View file
Open in desktop
Expand Up @@ -6,6 +6,8 @@
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "frontendController",
"containers": [{
"image": "brendanburns/php-redis",
"ports": [{"containerPort": 80, "hostPort": 8000}]
Expand Down
6 changes: 6 additions & 0 deletions examples/guestbook/guestbook.md
View file
Open in desktop
Expand Up @@ -21,6 +21,8 @@ Create a file named `redis-master.json` describing a single pod, which runs a re
"id": "redis-master-2",
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "redis-master-2",
"containers": [{
"name": "master",
"image": "dockerfile/redis",
Expand Down Expand Up @@ -112,6 +114,8 @@ Create a file named `redis-slave-controller.json` that contains:
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "redisSlaveController",
"containers": [{
"image": "brendanburns/redis-slave",
"ports": [{"containerPort": 6379, "hostPort": 6380}]
Expand Down Expand Up @@ -195,6 +199,8 @@ Create a file named `frontend-controller.json`:
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "frontendController",
"containers": [{
"image": "brendanburns/php-redis",
"ports": [{"containerPort": 80, "hostPort": 8000}]
Expand Down
2 changes: 2 additions & 0 deletions examples/guestbook/redis-master.json
View file
Open in desktop
Expand Up @@ -2,6 +2,8 @@
"id": "redis-master-2",
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "redis-master-2",
"containers": [{
"name": "master",
"image": "dockerfile/redis",
Expand Down
2 changes: 2 additions & 0 deletions examples/guestbook/redis-slave-controller.json
View file
Open in desktop
Expand Up @@ -6,6 +6,8 @@
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "redisSlaveController",
"containers": [{
"image": "brendanburns/redis-slave",
"ports": [{"containerPort": 6379, "hostPort": 6380}]
Expand Down