Browse code
Fixed some differences between API and Docs in v1.22,v1.23,v1.24
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
(cherry picked from commit 370dbe0cd98e924e8641a72a437281dd7bce9f3d)
Robin Naundorf authored on 2016/03/30 17:12:11Showing 2 changed files
| ... | ... |
@@ -2547,7 +2547,7 @@ Sets up an exec instance in a running container `id` |
| 2547 | 2547 |
|
| 2548 | 2548 |
**Example response**: |
| 2549 | 2549 |
|
| 2550 |
- HTTP/1.1 201 OK |
|
| 2550 |
+ HTTP/1.1 201 Created |
|
| 2551 | 2551 |
Content-Type: application/json |
| 2552 | 2552 |
|
| 2553 | 2553 |
{
|
| ... | ... |
@@ -2594,8 +2594,8 @@ interactive session with the `exec` command. |
| 2594 | 2594 |
|
| 2595 | 2595 |
**Example response**: |
| 2596 | 2596 |
|
| 2597 |
- HTTP/1.1 201 OK |
|
| 2598 |
- Content-Type: application/json |
|
| 2597 |
+ HTTP/1.1 200 OK |
|
| 2598 |
+ Content-Type: application/vnd.docker.raw-stream |
|
| 2599 | 2599 |
|
| 2600 | 2600 |
{{ STREAM }}
|
| 2601 | 2601 |
|
| ... | ... |
@@ -2653,112 +2653,28 @@ Return low-level information about the `exec` command `id`. |
| 2653 | 2653 |
**Example response**: |
| 2654 | 2654 |
|
| 2655 | 2655 |
HTTP/1.1 200 OK |
| 2656 |
- Content-Type: plain/text |
|
| 2656 |
+ Content-Type: application/json |
|
| 2657 | 2657 |
|
| 2658 | 2658 |
{
|
| 2659 |
- "ID" : "11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39", |
|
| 2660 |
- "Running" : false, |
|
| 2661 |
- "ExitCode" : 2, |
|
| 2662 |
- "ProcessConfig" : {
|
|
| 2663 |
- "privileged" : false, |
|
| 2664 |
- "user" : "", |
|
| 2665 |
- "tty" : false, |
|
| 2666 |
- "entrypoint" : "sh", |
|
| 2667 |
- "arguments" : [ |
|
| 2668 |
- "-c", |
|
| 2669 |
- "exit 2" |
|
| 2670 |
- ] |
|
| 2671 |
- }, |
|
| 2672 |
- "OpenStdin" : false, |
|
| 2673 |
- "OpenStderr" : false, |
|
| 2674 |
- "OpenStdout" : false, |
|
| 2675 |
- "Container" : {
|
|
| 2676 |
- "State" : {
|
|
| 2677 |
- "Status" : "running", |
|
| 2678 |
- "Running" : true, |
|
| 2679 |
- "Paused" : false, |
|
| 2680 |
- "Restarting" : false, |
|
| 2681 |
- "OOMKilled" : false, |
|
| 2682 |
- "Pid" : 3650, |
|
| 2683 |
- "ExitCode" : 0, |
|
| 2684 |
- "Error" : "", |
|
| 2685 |
- "StartedAt" : "2014-11-17T22:26:03.717657531Z", |
|
| 2686 |
- "FinishedAt" : "0001-01-01T00:00:00Z" |
|
| 2687 |
- }, |
|
| 2688 |
- "ID" : "8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c", |
|
| 2689 |
- "Created" : "2014-11-17T22:26:03.626304998Z", |
|
| 2690 |
- "Path" : "date", |
|
| 2691 |
- "Args" : [], |
|
| 2692 |
- "Config" : {
|
|
| 2693 |
- "Hostname" : "8f177a186b97", |
|
| 2694 |
- "Domainname" : "", |
|
| 2695 |
- "User" : "", |
|
| 2696 |
- "AttachStdin" : false, |
|
| 2697 |
- "AttachStdout" : false, |
|
| 2698 |
- "AttachStderr" : false, |
|
| 2699 |
- "ExposedPorts" : null, |
|
| 2700 |
- "Tty" : false, |
|
| 2701 |
- "OpenStdin" : false, |
|
| 2702 |
- "StdinOnce" : false, |
|
| 2703 |
- "Env" : [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ], |
|
| 2704 |
- "Cmd" : [ |
|
| 2705 |
- "date" |
|
| 2706 |
- ], |
|
| 2707 |
- "Image" : "ubuntu", |
|
| 2708 |
- "Volumes" : null, |
|
| 2709 |
- "WorkingDir" : "", |
|
| 2710 |
- "Entrypoint" : null, |
|
| 2711 |
- "NetworkDisabled" : false, |
|
| 2712 |
- "MacAddress" : "", |
|
| 2713 |
- "OnBuild" : null, |
|
| 2714 |
- "SecurityOpt" : null |
|
| 2715 |
- }, |
|
| 2716 |
- "Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5", |
|
| 2717 |
- "NetworkSettings": {
|
|
| 2718 |
- "Bridge": "", |
|
| 2719 |
- "SandboxID": "", |
|
| 2720 |
- "HairpinMode": false, |
|
| 2721 |
- "LinkLocalIPv6Address": "", |
|
| 2722 |
- "LinkLocalIPv6PrefixLen": 0, |
|
| 2723 |
- "Ports": null, |
|
| 2724 |
- "SandboxKey": "", |
|
| 2725 |
- "SecondaryIPAddresses": null, |
|
| 2726 |
- "SecondaryIPv6Addresses": null, |
|
| 2727 |
- "EndpointID": "", |
|
| 2728 |
- "Gateway": "", |
|
| 2729 |
- "GlobalIPv6Address": "", |
|
| 2730 |
- "GlobalIPv6PrefixLen": 0, |
|
| 2731 |
- "IPAddress": "", |
|
| 2732 |
- "IPPrefixLen": 0, |
|
| 2733 |
- "IPv6Gateway": "", |
|
| 2734 |
- "MacAddress": "", |
|
| 2735 |
- "Networks": {
|
|
| 2736 |
- "bridge": {
|
|
| 2737 |
- "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812", |
|
| 2738 |
- "EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d", |
|
| 2739 |
- "Gateway": "172.17.0.1", |
|
| 2740 |
- "IPAddress": "172.17.0.2", |
|
| 2741 |
- "IPPrefixLen": 16, |
|
| 2742 |
- "IPv6Gateway": "", |
|
| 2743 |
- "GlobalIPv6Address": "", |
|
| 2744 |
- "GlobalIPv6PrefixLen": 0, |
|
| 2745 |
- "MacAddress": "02:42:ac:12:00:02" |
|
| 2746 |
- } |
|
| 2747 |
- } |
|
| 2659 |
+ "CanRemove": false, |
|
| 2660 |
+ "ContainerID": "b53ee82b53a40c7dca428523e34f741f3abc51d9f297a14ff874bf761b995126", |
|
| 2661 |
+ "DetachKeys": "", |
|
| 2662 |
+ "ExitCode": 2, |
|
| 2663 |
+ "ID": "f33bbfb39f5b142420f4759b2348913bd4a8d1a6d7fd56499cb41a1bb91d7b3b", |
|
| 2664 |
+ "OpenStderr": true, |
|
| 2665 |
+ "OpenStdin": true, |
|
| 2666 |
+ "OpenStdout": true, |
|
| 2667 |
+ "ProcessConfig": {
|
|
| 2668 |
+ "arguments": [ |
|
| 2669 |
+ "-c", |
|
| 2670 |
+ "exit 2" |
|
| 2671 |
+ ], |
|
| 2672 |
+ "entrypoint": "sh", |
|
| 2673 |
+ "privileged": false, |
|
| 2674 |
+ "tty": true, |
|
| 2675 |
+ "user": "1000" |
|
| 2748 | 2676 |
}, |
| 2749 |
- "ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf", |
|
| 2750 |
- "HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname", |
|
| 2751 |
- "HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts", |
|
| 2752 |
- "LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log", |
|
| 2753 |
- "Name" : "/test", |
|
| 2754 |
- "Driver" : "aufs", |
|
| 2755 |
- "ExecDriver" : "native-0.2", |
|
| 2756 |
- "MountLabel" : "", |
|
| 2757 |
- "ProcessLabel" : "", |
|
| 2758 |
- "AppArmorProfile" : "", |
|
| 2759 |
- "RestartCount" : 0, |
|
| 2760 |
- "Mounts" : [] |
|
| 2761 |
- } |
|
| 2677 |
+ "Running": false |
|
| 2762 | 2678 |
} |
| 2763 | 2679 |
|
| 2764 | 2680 |
Status Codes: |
| ... | ... |
@@ -2590,7 +2590,7 @@ Sets up an exec instance in a running container `id` |
| 2590 | 2590 |
|
| 2591 | 2591 |
**Example response**: |
| 2592 | 2592 |
|
| 2593 |
- HTTP/1.1 201 OK |
|
| 2593 |
+ HTTP/1.1 201 Created |
|
| 2594 | 2594 |
Content-Type: application/json |
| 2595 | 2595 |
|
| 2596 | 2596 |
{
|
| ... | ... |
@@ -2637,8 +2637,8 @@ interactive session with the `exec` command. |
| 2637 | 2637 |
|
| 2638 | 2638 |
**Example response**: |
| 2639 | 2639 |
|
| 2640 |
- HTTP/1.1 201 OK |
|
| 2641 |
- Content-Type: application/json |
|
| 2640 |
+ HTTP/1.1 200 OK |
|
| 2641 |
+ Content-Type: vnd.docker.raw-stream |
|
| 2642 | 2642 |
|
| 2643 | 2643 |
{{ STREAM }}
|
| 2644 | 2644 |
|
| ... | ... |
@@ -2696,112 +2696,28 @@ Return low-level information about the `exec` command `id`. |
| 2696 | 2696 |
**Example response**: |
| 2697 | 2697 |
|
| 2698 | 2698 |
HTTP/1.1 200 OK |
| 2699 |
- Content-Type: plain/text |
|
| 2699 |
+ Content-Type: application/json |
|
| 2700 | 2700 |
|
| 2701 | 2701 |
{
|
| 2702 |
- "ID" : "11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39", |
|
| 2703 |
- "Running" : false, |
|
| 2704 |
- "ExitCode" : 2, |
|
| 2705 |
- "ProcessConfig" : {
|
|
| 2706 |
- "privileged" : false, |
|
| 2707 |
- "user" : "", |
|
| 2708 |
- "tty" : false, |
|
| 2709 |
- "entrypoint" : "sh", |
|
| 2710 |
- "arguments" : [ |
|
| 2711 |
- "-c", |
|
| 2712 |
- "exit 2" |
|
| 2713 |
- ] |
|
| 2714 |
- }, |
|
| 2715 |
- "OpenStdin" : false, |
|
| 2716 |
- "OpenStderr" : false, |
|
| 2717 |
- "OpenStdout" : false, |
|
| 2718 |
- "Container" : {
|
|
| 2719 |
- "State" : {
|
|
| 2720 |
- "Status" : "running", |
|
| 2721 |
- "Running" : true, |
|
| 2722 |
- "Paused" : false, |
|
| 2723 |
- "Restarting" : false, |
|
| 2724 |
- "OOMKilled" : false, |
|
| 2725 |
- "Pid" : 3650, |
|
| 2726 |
- "ExitCode" : 0, |
|
| 2727 |
- "Error" : "", |
|
| 2728 |
- "StartedAt" : "2014-11-17T22:26:03.717657531Z", |
|
| 2729 |
- "FinishedAt" : "0001-01-01T00:00:00Z" |
|
| 2730 |
- }, |
|
| 2731 |
- "ID" : "8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c", |
|
| 2732 |
- "Created" : "2014-11-17T22:26:03.626304998Z", |
|
| 2733 |
- "Path" : "date", |
|
| 2734 |
- "Args" : [], |
|
| 2735 |
- "Config" : {
|
|
| 2736 |
- "Hostname" : "8f177a186b97", |
|
| 2737 |
- "Domainname" : "", |
|
| 2738 |
- "User" : "", |
|
| 2739 |
- "AttachStdin" : false, |
|
| 2740 |
- "AttachStdout" : false, |
|
| 2741 |
- "AttachStderr" : false, |
|
| 2742 |
- "ExposedPorts" : null, |
|
| 2743 |
- "Tty" : false, |
|
| 2744 |
- "OpenStdin" : false, |
|
| 2745 |
- "StdinOnce" : false, |
|
| 2746 |
- "Env" : [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ], |
|
| 2747 |
- "Cmd" : [ |
|
| 2748 |
- "date" |
|
| 2749 |
- ], |
|
| 2750 |
- "Image" : "ubuntu", |
|
| 2751 |
- "Volumes" : null, |
|
| 2752 |
- "WorkingDir" : "", |
|
| 2753 |
- "Entrypoint" : null, |
|
| 2754 |
- "NetworkDisabled" : false, |
|
| 2755 |
- "MacAddress" : "", |
|
| 2756 |
- "OnBuild" : null, |
|
| 2757 |
- "SecurityOpt" : null |
|
| 2758 |
- }, |
|
| 2759 |
- "Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5", |
|
| 2760 |
- "NetworkSettings": {
|
|
| 2761 |
- "Bridge": "", |
|
| 2762 |
- "SandboxID": "", |
|
| 2763 |
- "HairpinMode": false, |
|
| 2764 |
- "LinkLocalIPv6Address": "", |
|
| 2765 |
- "LinkLocalIPv6PrefixLen": 0, |
|
| 2766 |
- "Ports": null, |
|
| 2767 |
- "SandboxKey": "", |
|
| 2768 |
- "SecondaryIPAddresses": null, |
|
| 2769 |
- "SecondaryIPv6Addresses": null, |
|
| 2770 |
- "EndpointID": "", |
|
| 2771 |
- "Gateway": "", |
|
| 2772 |
- "GlobalIPv6Address": "", |
|
| 2773 |
- "GlobalIPv6PrefixLen": 0, |
|
| 2774 |
- "IPAddress": "", |
|
| 2775 |
- "IPPrefixLen": 0, |
|
| 2776 |
- "IPv6Gateway": "", |
|
| 2777 |
- "MacAddress": "", |
|
| 2778 |
- "Networks": {
|
|
| 2779 |
- "bridge": {
|
|
| 2780 |
- "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812", |
|
| 2781 |
- "EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d", |
|
| 2782 |
- "Gateway": "172.17.0.1", |
|
| 2783 |
- "IPAddress": "172.17.0.2", |
|
| 2784 |
- "IPPrefixLen": 16, |
|
| 2785 |
- "IPv6Gateway": "", |
|
| 2786 |
- "GlobalIPv6Address": "", |
|
| 2787 |
- "GlobalIPv6PrefixLen": 0, |
|
| 2788 |
- "MacAddress": "02:42:ac:12:00:02" |
|
| 2789 |
- } |
|
| 2790 |
- } |
|
| 2702 |
+ "CanRemove": false, |
|
| 2703 |
+ "ContainerID": "b53ee82b53a40c7dca428523e34f741f3abc51d9f297a14ff874bf761b995126", |
|
| 2704 |
+ "DetachKeys": "", |
|
| 2705 |
+ "ExitCode": 2, |
|
| 2706 |
+ "ID": "f33bbfb39f5b142420f4759b2348913bd4a8d1a6d7fd56499cb41a1bb91d7b3b", |
|
| 2707 |
+ "OpenStderr": true, |
|
| 2708 |
+ "OpenStdin": true, |
|
| 2709 |
+ "OpenStdout": true, |
|
| 2710 |
+ "ProcessConfig": {
|
|
| 2711 |
+ "arguments": [ |
|
| 2712 |
+ "-c", |
|
| 2713 |
+ "exit 2" |
|
| 2714 |
+ ], |
|
| 2715 |
+ "entrypoint": "sh", |
|
| 2716 |
+ "privileged": false, |
|
| 2717 |
+ "tty": true, |
|
| 2718 |
+ "user": "1000" |
|
| 2791 | 2719 |
}, |
| 2792 |
- "ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf", |
|
| 2793 |
- "HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname", |
|
| 2794 |
- "HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts", |
|
| 2795 |
- "LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log", |
|
| 2796 |
- "Name" : "/test", |
|
| 2797 |
- "Driver" : "aufs", |
|
| 2798 |
- "ExecDriver" : "native-0.2", |
|
| 2799 |
- "MountLabel" : "", |
|
| 2800 |
- "ProcessLabel" : "", |
|
| 2801 |
- "AppArmorProfile" : "", |
|
| 2802 |
- "RestartCount" : 0, |
|
| 2803 |
- "Mounts" : [] |
|
| 2804 |
- } |
|
| 2720 |
+ "Running": false |
|
| 2805 | 2721 |
} |
| 2806 | 2722 |
|
| 2807 | 2723 |
Status Codes: |