toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,495 Commits 3 Branches 295 Tags
dbf2eb748849a133d7cec82cbee94df166c94240
Commit Graph

10495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
dbf2eb7488 Proper JSON handling of strings that could be represented as other types 
Addresses #6830

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 1b0b1ec65729a2e018df1334b70b851714995e9e
Component: engine
 2014-09-16 13:51:02 -04:00
Tibor Vass
3f5c1d5939 Merge pull request #8051 from jfrazelle/image-tag-can-be-one-letter-test-update 
Update integration-cli tests to allow one-letter tag as valid
Upstream-commit: 8b18a2da54119bb0586bcb9fd2715c9cf6a1ee58
Component: engine
 2014-09-15 18:25:59 -04:00
Jessica Frazelle
c472fc422b Update integration-cli tests to allow one-letter tag as valid. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 985fae256f3fcaea5cf67581ae3d83a46bc52d9e
Component: engine
 2014-09-15 15:17:50 -07:00
Jessie Frazelle
1849466b73 Merge pull request #8049 from unclejack/fix_tag_validation 
graph: validate tags properly & add unit tests
Upstream-commit: 09982d0f975cfc302fb12f22905673546ef40cd7
Component: engine
 2014-09-15 14:32:02 -07:00
unclejack
fc234a85d7 graph: validate tags properly & add unit tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: ada883b198aa5e7a42d344174dcec04933c6fb2a
Component: engine
 2014-09-16 00:13:54 +03:00
Fred Lifton
bd606a30d9 Merge pull request #8023 from nerab/patch-1 
Append instead of replace file contents
Upstream-commit: 4b0bb716270bab57714c54ac12f295345263fc54
Component: engine
 2014-09-15 13:54:41 -07:00
Fred Lifton
ecad7daa7e Merge pull request #8005 from SvenDowideit/document-sshd-env-vars 
Document how to pass ENV vars to the user's shell
Upstream-commit: c89242320915c465d3c5d5feae78a175a43bd356
Component: engine
 2014-09-15 12:44:56 -07:00
Fred Lifton
6920f6eb53 Merge pull request #8044 from brahmaroutu/container_copy_6107 
Change the copy command Content-Type header to x-tar
Upstream-commit: fd501d4b3ae8ce1be631bcf9e00333ba75667dfa
Component: engine
 2014-09-15 12:06:48 -07:00
Alexandr Morozov
3da88c8c53 Merge pull request #8020 from erikh/rewrite_hosts_files 
Links v2: Mutable network files
Upstream-commit: fbae71326ccc24f6be720f64e0ea48c59376452b
Component: engine
 2014-09-15 23:03:30 +04:00
Srini Brahmaroutu
084a5b1c3f Change the copy command Content-Type header to x-tar 
Addresses #6107

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 788e4acaa3883bc7369f9462f107266b41c59746
Component: engine
 2014-09-15 10:45:06 -07:00
Alexandr Morozov
e94b553155 Merge pull request #8038 from unclejack/failed_build_context_cleanup 
clean up the context when a build fails
Upstream-commit: 88a786d3c4475e7aa14c35e4ef02cf52e37b43df
Component: engine
 2014-09-15 17:50:50 +04:00
unclejack
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
unclejack
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
unclejack
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
Sven Dowideit
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
Erik Kristensen
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
Sven Dowideit
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
Nicholas E. Rabenau
a1ea7562ca Append instead of replace file contents 
I think the `DOCKER_OPTS` should be appended to `/etc/default/docker` and not replace the entire contents.
Upstream-commit: 81357e12e7a019c14d87dc491705ad92409293b7
Component: engine
 2014-09-13 22:26:40 +02:00
Erik Hollensbe
d8cb453d89 Allow /etc/hosts and /etc/resolv.conf to be updated both outside and 
inside the container.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 09b700288e4804162ef86c99466e08b6b016e0c4
Component: engine
 2014-09-13 11:27:34 -07:00
Tibor Vass
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
unclejack
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
Michael Crosby
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
Doug Davis
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
Michael Crosby
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
Jessica Frazelle
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
Fred Lifton
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
Fred Lifton
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
James Turnbull
0c0764613c Merge pull request #8011 from fsouza/fix-typo-remote-api 
docs/reference/api: fix typo in docs
Upstream-commit: 127f72d3ba7bbeeb796b6206f24982bbc4f223d7
Component: engine
 2014-09-12 13:26:24 -04:00
Francisco Souza
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
Alexandr Morozov
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
unclejack
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
James Turnbull
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
David Gebler
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Erik Hollensbe
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
Tibor Vass
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
Sven Dowideit
ec6541bfd4 Document how to pass ENV vars to the user's shell 
As this is a somewhat common question.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 0517099a91a3ca073efb2131684bbf3ab565644a
Component: engine
 2014-09-12 13:34:01 +10:00
Sven Dowideit
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
Michael Crosby
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
Sven Dowideit
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
Sven Dowideit
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
Sven Dowideit
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
Michael Crosby
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
Michael Crosby
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
Jessie Frazelle
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
Phil Estes
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
Phil Estes
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