78fee01e67
Fix bug in attach handling for docker exec. Add docs for 'docker exec' feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: d130c10ab78417ebf64284c2a399304767446c88
Component: engine
2014-09-15 16:59:05 +00:00
b0ee16aad4
Import nsenter in docker.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: e1cf95b593a57e0c8f15d50bb3e5e8ccfb55defa
Component: engine
2014-09-15 16:59:05 +00:00
a9173e0a9b
Adding 'exec' command to remote API and CLI.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 985d57958675ee11e23070e009605c8968d547cf
Component: engine
2014-09-15 16:59:03 +00:00
a11625614e
Adding support for docker exec in daemon.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 5130fe5d38837302e72bdc5e4bd1f5fa1df72c7f
Component: engine
2014-09-15 16:57:52 +00:00
f867da582c
Adding Exec method to native execdriver.
...
Modified Attach() method to support docker exec.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: f3c767d798f945192d32441cf624bdd54e746b74
Component: engine
2014-09-15 16:57:52 +00:00
8ef9f79072
clean up the context when a build fails
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 31c0039022234972c79947a6299c0fa382436487
Component: engine
2014-09-15 16:01:23 +03:00
560885c335
Merge pull request #7698 from tamsky/tune2fs_base_filesystem
...
use tune2fs to disable ext4 mount counts and mount intervals
Upstream-commit: a10a86d437148fe93c0ad128a233f42b17b22700
Component: engine
2014-09-15 15:42:52 +03:00
eb7e1f51d1
Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999
...
Fix ps -s hang
Upstream-commit: c751e1739d56e38aa9a813c369d78c6dbdc37b07
Component: engine
2014-09-15 13:54:29 +03:00
b39b11e4fc
Merge pull request #8028 from SvenDowideit/ekristen-patch-1
...
HTTP Status 201 not 200
Upstream-commit: 0658be89d0d8b623ba9738eb25e78b666d33b34e
Component: engine
2014-09-15 11:00:05 +10:00
5d83fcb509
HTTP Status 201 not 200
...
The http status should be 201 not 200.
Docker-DCO-1.1-Signed-off-by: Erik Kristensen <erik@erikkristensen.com > (github: SvenDowideit)
Upstream-commit: c4db3b8075ab4b8bd0c6599cb19e09eb77c82946
Component: engine
2014-09-15 10:58:45 +10:00
fb75c62292
Merge pull request #8008 from dwgebler/master
...
fixes incorrect environment variable labeling in container linking guide
Upstream-commit: 0c5a7ad577a0525419e009884ef5e2f0d095d11c
Component: engine
2014-09-15 10:51:38 +10:00
3fd5e4c058
Merge pull request #7983 from vbatts/vbatts-tarsum_switch_names
...
tarsum: TarSum should be the interface
Upstream-commit: 23f490427f80f6b48f19767cbebb10ddff6997f3
Component: engine
2014-09-12 17:01:35 -04:00
921f58e1dd
Merge pull request #8014 from jfrazelle/8012-prevent-container-names-starting-dash
...
Ensure container names start with a-zA-Z0-9
Upstream-commit: da4dba2e8c9866219ad99308d2d503a5aae634ec
Component: engine
2014-09-12 23:15:16 +03:00
439e5d1e9a
Merge pull request #8004 from duglin/Issue6447
...
Fix parsing of proto/port - issue 6447
Upstream-commit: 63a15486882e1dad12e427737fd150194be6c511
Component: engine
2014-09-12 12:00:57 -07:00
4d322385b8
Fix parsing of proto/port
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 658a9d0f471b903035869ffadece5806768ab690
Component: engine
2014-09-12 11:39:14 -07:00
7af7544c23
Merge pull request #7934 from LK4D4/fix_double_allocation
...
Fix error propagation from userland-proxy
Upstream-commit: a96811272a7fbc695a1c3cc9931bb8b9f784978e
Component: engine
2014-09-12 11:39:10 -07:00
a8bfc34d1d
Ensure container names start with a-zA-Z0-9
...
Closes #8012 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: aa2af817bee123827f4a857555db8fea5e01e7d7
Component: engine
2014-09-12 10:45:07 -07:00
0e0922f67a
Merge pull request #7986 from abh1nav/master
...
Update remote_api_client_libraries.md
Upstream-commit: 64ecef59af2d5befd5624f3eb73e9ff16d827c55
Component: engine
2014-09-12 10:37:00 -07:00
9a7a429b7a
Merge pull request #7987 from SvenDowideit/stop-hurting-blackrosezys-eyes
...
Yep, its been hurting my eyes too - and you've finally inspired me to fi...
Upstream-commit: 1501adad29bee6ebb40589a08b6374374d7c3fbf
Component: engine
2014-09-12 10:35:30 -07:00
990ce2ca68
docs/reference/api: fix typo in docs
...
Signed-off-by: Francisco Souza <f@souza.cc >
Upstream-commit: fe5b72e7bb4f7c043409196cb98d46796f2dc390
Component: engine
2014-09-12 13:57:43 -03:00
797acb46eb
Merge pull request #8009 from unclejack/better_run_test_debug
...
integ-cli: better debug output for run & import
Upstream-commit: a612d859165d297287164be30bfab4e676f1369c
Component: engine
2014-09-12 18:38:46 +04:00
35e640c370
integ-cli: better debug output for run & import
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 3ec564bfda57f068aac813f4b985385c1c7e4f23
Component: engine
2014-09-12 16:51:21 +03:00
92ab71ec69
Merge pull request #7998 from duglin/Issue5701
...
Add notes about single-quotes (for issue 5701)
Upstream-commit: b6b85a58fd0455f2655219706e6061a5847b21b7
Component: engine
2014-09-12 07:41:31 -04:00
23359870fc
Signed-off-by: David Gebler <davidgebler@gmail.com>
...
modified: userguide/dockerlinks.md
fixes incorrect environment variable labeling in container linking guide
Upstream-commit: 78fe117076289695ab03c90d266c47438ab8db7a
Component: engine
2014-09-12 11:04:40 +01:00
1a0325cec5
Test for docker ps -s
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 41cbce8c005c201169e13902d62112ced9902928
Component: engine
2014-09-12 11:45:50 +04:00
7af74b4383
Use unlocked version of changes for GetImage
...
Fixes #7999
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 82bdd88e9c9db40ee8072f7c4c2832dfb3f73823
Component: engine
2014-09-12 11:44:51 +04:00
8627c41d84
Use defined variable
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 555ce0cb54943dab39f16582fc1923467e42af14
Component: engine
2014-09-12 11:42:12 +04:00
06ff531f43
Fix my own comments from #7927
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 41e9e93e27ccd637d9490412622529bdc7d7b8ff
Component: engine
2014-09-12 10:05:07 +04:00
9e31fe0a00
Fix an issue where already allocated ports would not trigger an error.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 3b6a29b81a5280187b3d03c91950cf93f7e263ec
Component: engine
2014-09-12 09:51:14 +04:00
d6bc3658af
Add Test for port allocation bug (port already in use by other programs than docker)
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 3109fc9537682a7b9ee566f3674484b1b2296707
Component: engine
2014-09-12 09:51:14 +04:00
f8e23ee9a1
Override prettyPrint's colour choice (red) for strings in quotes.
...
I've moved the docs.css to last so it can tweak any existing css, and
then set that to the same grey colour used for 'normal' text.
While testing I found and fixed an over-zealous line wrap.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: df8dbfa45dee108c6bb002f49a5f36e7d911616d
Component: engine
2014-09-12 11:10:07 +10:00
2bf1cd4824
Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag
...
Failing to remove an image, will not remove the image name/tag.
Upstream-commit: 32b5d145faac9013f9f78adfe3bb2a171d818863
Component: engine
2014-09-11 18:06:18 -07:00
d739fdd226
Merge pull request #7988 from markotibold/patch-1
...
Fixed a typo
Upstream-commit: 990da301cf79a07206751b6407125eb4ccbe4d9d
Component: engine
2014-09-12 10:41:12 +10:00
5948eafc31
Merge pull request #7991 from laktek/master
...
Fixed a typo in docs (outpu -> output).
Upstream-commit: c0783dfcebfd78b5798a7ea104162bb38180c265
Component: engine
2014-09-12 10:40:16 +10:00
567a864e6a
Merge pull request #8000 from estesp/7985-networkport-doc-changes
...
Match docs to actual port range used in code.
Upstream-commit: 6941931daad9653109df20f014d2a4f3b2c8fa93
Component: engine
2014-09-12 10:18:03 +10:00
666bfb2887
Merge pull request #7957 from bfirsh/consistent-help-messages
...
Consistent help messages
Upstream-commit: d9c7c1a7dadf1835587f993b7fe2029bb07f1ce0
Component: engine
2014-09-11 15:25:28 -07:00
d6e3f1dab9
Merge pull request #7996 from estesp/7943-validate-tagnames
...
Validate tag names similar to repository name validation; add tests
Upstream-commit: 98e409172cb5872e0b081244bf8802e4a422d735
Component: engine
2014-09-11 15:19:50 -07:00
9bdc95ea12
Merge pull request #7959 from crosbymichael/update-libcontainer-sep6
...
Update libcontainer to 84ad9386a0240acb7475429a835
Upstream-commit: 2d4e43b26b93bb3c0e797fbf8b254077d6d7ed40
Component: engine
2014-09-11 14:59:24 -07:00
31470054b1
Validate tag names similar to repository name validation; add tests
...
Addresses #7943
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 46eb4140c915e05a893080b34b42e25b6a75de7b
Component: engine
2014-09-11 17:52:36 -04:00
3be52d7f70
Match docs to actual port range used in code.
...
Addresses #7985
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: d6f4b2ebb40ac79c3ba21e7196bba3b83124cf16
Component: engine
2014-09-11 17:20:01 -04:00
ad8c137992
Removing an image that fails, also removes the image name/tag.
...
Fixes #7845 and #7801 , and a real pain point I had :)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: b2efdc538de47d37718b8972cd6703be32fc23c2
Component: engine
2014-09-11 11:29:25 -07:00
f59e13d587
Merge pull request #7202 from timbot/add-registry-mirror-flag
...
Add daemon flag to specify public registry mirrors
Upstream-commit: ed7fb3bbdaa5cbce2563567eaa4cef67fc172270
Component: engine
2014-09-11 11:11:01 -07:00
6a8c7d0e92
Merge pull request #7806 from erikh/fix_cmd_handling_in_parser
...
Fix cmd and entrypoint handling in parser
Upstream-commit: 08f1a91ccd39a880645d4dbe8a45173f17cf42fe
Component: engine
2014-09-11 10:42:22 -07:00
17af1eaec1
Add notes about single-quotes
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b47a2fbdc545d649a945e78a22da0c5dd9df0921
Component: engine
2014-09-11 10:19:07 -07:00
2d65e30419
builder: Fix an error check being done at the wrong spot in run
...
dispatcher
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 91bed436215f272c2956abb969425ee0bfd3a998
Component: engine
2014-09-11 06:00:24 -07:00
665c625297
move entrypoint integration-cli test for blank entrypoint to separate function
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 576416c99a0ae8ad27467f217ec21f598e4f4cc8
Component: engine
2014-09-11 06:00:24 -07:00
d8ce78da21
Do not populate path to prevent runconfig merge conflict; remove
...
autoConfig seeding of entrypoint.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 92f885d7bd9d4a8f5d30ec650a7625a8727d952e
Component: engine
2014-09-11 06:00:24 -07:00
b3a58e1095
evaluator: ensure entrypoint stays blank if set blank while CMD is set.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 78a847a47ac777f4090c06a82e875ee30f9a1cbd
Component: engine
2014-09-11 06:00:24 -07:00
76991d395e
builder: Fix entrypoint and cmd semantics in evaluator. Test c/o @cnf
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: ac107995ae4a24195f8bb6b70c26393a87d19982
Component: engine
2014-09-11 06:00:24 -07:00
a3d374a131
builder: Fix a small bug that could improperly cache.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 3a6d1228a83ba0f9dd96138ccccfa758c0956a62
Component: engine
2014-09-11 06:00:24 -07:00
