toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,201 Commits 3 Branches 295 Tags
b82d2b880101df55a808119e45fe22787fae1dce
Commit Graph
4201 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Larsson 58f4b4c19f Utils: Add ShellQuoteArguments 
Upstream-commit: c5bc7d515836cffee90ba5bb342272bba64d9f37
Component: engine
 2013-11-06 20:39:09 +01:00
Nate Jones 143de969f1 fix /images/json doc for 1.7 
Upstream-commit: 16eba6bbb514fb4082e6779e175a29698a6734ce
Component: engine
 2013-11-06 11:30:04 -08:00
Victor Vieux 34d9e796b2 Merge pull request #2568 from mrallen1/fix/1965 
See if a path exists before injecting Reader there
Upstream-commit: 0dd6c6645bd7148537c6e4b3b32abe1c852b992c
Component: engine
 2013-11-06 10:57:06 -08:00
Michael Crosby a135b385fd Update documentation to reflect changes in Config and HostConfig 
Upstream-commit: 70f44d5531a5c6dcb96b7e608a96beb52e93b506
Component: engine
 2013-11-06 10:01:58 -08:00
Guillaume J. Charmes d677b4b873 Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change 
change ID to CONTAINER ID/IMAGE ID
Upstream-commit: 45aba3dc959d867147fedc8e8ac578d2acfb4d79
Component: engine
 2013-11-06 09:45:23 -08:00
Guillaume J. Charmes 2e67093fd5 Merge pull request #1577 from mrallen1/fix/1502 
Prevent DNS server conflicts in CreateBridgeIface
Upstream-commit: c22ff0296e743443b3d79b0bd5f8b9bd97a77e13
Component: engine
 2013-11-06 07:52:50 -08:00
Guillaume J. Charmes 563816191a Add debug to iptables 
Upstream-commit: 00f1398f7a8543e2448723635d93ea6ddf1eaadb
Component: engine
 2013-11-06 07:37:43 -08:00
Mark Allen 73c7a730fc See if a path exists before injecting Reader there 
Closes #1965
Upstream-commit: 74f853a2aeaf86ff675ecab5387bbd710a0138b7
Component: engine
 2013-11-05 23:44:52 -06:00
Daniel Norberg f530e76f7f gograph: allow Walk() reentrance 
Hold the read lock while reading the child graph,
then walk over the children without any lock, in
order to avoid deadlock.
Upstream-commit: 20881f1f787e093a6f3e9360624d8b436b9f7379
Component: engine
 2013-11-06 00:18:45 -05:00
Marc Kuo c0461f4ee4 Add -p when running the container 
Without it, docker was not mapping/exposing the private port

Docker version 0.6.5, build 3ff8459
Upstream-commit: 3108f0526ef25596c7f6f545b07c95d90e966a7d
Component: engine
 2013-11-05 20:48:16 -08:00
Nate Jones 02bfc139c1 fixup for rebase 
Upstream-commit: 22ef38ee79c2f353578f3642918a44126b4cb48c
Component: engine
 2013-11-06 04:23:07 +00:00
Nate Jones 2e403649d0 update "images" documentation 
Upstream-commit: 6d5b73c2a6d668b11d6b5c643a45170265bf73c0
Component: engine
 2013-11-06 04:23:07 +00:00
Nate Jones e9a1f4f7ff add image size to -tree 
Upstream-commit: b7d1d35c278c57ad4732dc23e529cf771158ee96
Component: engine
 2013-11-06 04:23:07 +00:00
Nate Jones 377a3eb7ca adding test for "images -tree" 
Upstream-commit: f1aeac361aadc90a35e1b839933afbf9ad27a1a1
Component: engine
 2013-11-06 04:23:02 +00:00
Nate Jones 7820a4a479 adding test for "images -viz" 
Upstream-commit: d9fe0647cb464ccd6f79ac33fb1d1ac56441f6b0
Component: engine
 2013-11-06 04:04:24 +00:00
Nate Jones f53ad091dd make existing tests pass 
Upstream-commit: 059bb7a262a7620d8c7c5fdd064af352ae242f65
Component: engine
 2013-11-06 03:58:16 +00:00
Nate Jones 2dbd3407de implement "images -tree" 
Upstream-commit: ec9a9a08b8b76079207ced5b55a7caade27fb3d3
Component: engine
 2013-11-06 03:58:16 +00:00
Nate Jones 736f474973 bring back /images/viz, but 404 for latest 
Upstream-commit: 8f64759881b3d48e42927ed9bdf1c9162d3c8bb3
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones cbbaa36a2b move "images -viz" to client 
Upstream-commit: 2a5998baf172f94a8d6866e46207a0d7d75e70e5
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones 08d9fe490e fix "images -a" 
Upstream-commit: dcf0279a50e7a2eca97b205725df474a516b8f79
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones b5c0cbf917 bump api version and ensure backward compat 
Upstream-commit: d7928b9a673e9b2aff36fa6961481312455c91f4
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones 59c6d98498 rework images JSON 
Upstream-commit: 15867ff4308c5c1330a400be56410d404336100f
Component: engine
 2013-11-06 03:58:15 +00:00
Mark Allen a507d209c4 Prevent DNS server conflicts in CreateBridgeIface 
Retrieve /etc/resolv.conf data (if available)

Add checkNameserverOverlaps and call it to
make sure there are no conflicts

Add utils.GetNameserversAsCIDR and tests

Read /etc/resolv.conf and pull out nameservers,
formatting them as a CIDR block ("1.2.3.4/32")
Upstream-commit: 3560c922b193e0f6b06c715a7b920f90a5990859
Component: engine
 2013-11-05 21:24:37 -06:00
Daniel Norberg b581ea208c gograph: Use RWMutex to allow concurrent readers 
Upstream-commit: 04aca7c9e3edddc57a1fbc11e57e6c62e6847126
Component: engine
 2013-11-05 22:07:14 -05:00
Guillaume J. Charmes ab0ebf12a7 Merge pull request #2566 from unclejack/fix_commands_test 
fix build for commands_test
Upstream-commit: 6113e1d62d429e7520a517ecbff331d58d51a0b7
Component: engine
 2013-11-05 15:45:22 -08:00
unclejack a503078311 fix build for commands_test 
Upstream-commit: cdf0cf495d0e0f0bbfdd8021f9cd6e68a8234dd4
Component: engine
 2013-11-06 01:41:54 +02:00
Daniel Norberg 2a939ef85f lock around read operations in graph 
Writes and reads will fail with ErrBusy if there's
concurrent reads or writes, respectively. It is
not sufficient to only lock around writes.
Upstream-commit: 1dc34e2b965253a62d52f84a0f548334d4d6aa9d
Component: engine
 2013-11-05 18:26:07 -05:00
Solomon Hykes e83abd1b63 Remove debug messages 
Upstream-commit: 8d6df3a7e2080d4fad9743beb159f12caa0ff6f7
Component: engine
 2013-11-05 23:00:20 +00:00
Solomon Hykes e6df3df72c Engine: 'create' creates a container and prints its ID on stdout 
Upstream-commit: e5f8ab6160401fb541121da5b5cbc3af4fce28b7
Component: engine
 2013-11-05 23:00:20 +00:00
Solomon Hykes bf0674c59a Fix main() 
Upstream-commit: 5c42b2b5122c1db08d229c258da26869b4d4d9cc
Component: engine
 2013-11-05 23:00:20 +00:00
Solomon Hykes c3fb3fd512 Better error reporting in engine logs and unit tests 
Upstream-commit: d3f074494a9594bc268bf4c639a7aea0934ec7c0
Component: engine
 2013-11-05 23:00:20 +00:00
Solomon Hykes 53c37bc88e Engine: fix a bug when encoding a job environment to json 
Upstream-commit: 434f06d03dc2825cb4f348a88ddc6d1aa17ea19c
Component: engine
 2013-11-05 23:00:20 +00:00
Solomon Hykes c136168290 Hack: simplify the creation of test directories 
Upstream-commit: 5a85456d481a5f88fc0efc02c41b3bff987c0ed1
Component: engine
 2013-11-05 23:00:16 +00:00
Andy Rothfusz bbfaa00404 Merge pull request #2562 from tchaudhri/patch-1 
(doc) Update ubuntulinux.rst
Upstream-commit: 980eda4c25c2221127f93b7b5194e372a29be197
Component: engine
 2013-11-05 14:52:07 -08:00
Andy Rothfusz 8a1dabb05a Merge pull request #2423 from rogaha/volumes_doc 
Added volumes documentation
Upstream-commit: bf05eb8ac0a8c919131c9c640e52b73387b9a1e0
Component: engine
 2013-11-05 14:38:28 -08:00
Tianon Gravi e77776215c Merge pull request #2563 from mzdaniel/desktop-integration 
contrib: Desktop integration. Firefox usecase.
Upstream-commit: f3f9f652e1fac6039784ff11290a5cb5979ad024
Component: engine
 2013-11-05 14:02:13 -08:00
Victor Vieux 63b79169a2 Merge pull request #2298 from unclejack/2070-validate_src_for_bind_mounts 
validate source for bind mounts
Upstream-commit: 2205bb43ea1e1709b104896266edeaf58395005b
Component: engine
 2013-11-05 13:31:10 -08:00
Daniel Mizyrycki 893c4c44a9 contrib: Desktop integration. Firefox usecase. 
Upstream-commit: 5af87d147580555c72e6a1d448ab663f991cc737
Component: engine
 2013-11-05 13:21:52 -08:00
unclejack 497f4207e9 test: error out when bind mount source doesn't exist 
This adds a test to verify that the server is checking whether the path
to be bind mounted actually exists on the server.
Upstream-commit: 35430e89201972d877ba01405f966882a1d3888a
Component: engine
 2013-11-05 22:54:24 +02:00
unclejack 9f8cb6e156 validate bind mounts on the server side 
This changes the server side code to make sure that:
1) the source of a bind mount isn't /
   The bind mount "/:/foo" isn't allowed.
2) Check that the source exists
   The source to be bind mounted must exist.

This fixes issue #2070.
Upstream-commit: 4d2ba779e1a0596c51cc6ed2ddb7c2139830f15c
Component: engine
 2013-11-05 22:54:24 +02:00
unclejack 730dda3e21 add test to ensure / can't be bind mounted 
This adds a test which checks that we're erroring out when we attempt
to bind mount root in a container.
Upstream-commit: f1f39616eb052455a383de589bbc1eaa9ab5d96c
Component: engine
 2013-11-05 22:54:24 +02:00
unclejack 26ce0d7e39 disallow / as source for bind mount in the cli 
This makes the docker cli reject docker run commands which include bind
mounts like "/:/some/path/in/the/container".
Bind mounting the root directory is a bad idea and the cli should throw
an error right away.

The same check will also be made by the remote API via another commit.
Upstream-commit: 4b8c41c4a2591797f97ad079e4314b21498ba732
Component: engine
 2013-11-05 22:52:54 +02:00
James Turnbull 8da2c74ae5 Removed redundant linking example 
Upstream-commit: e88368b34cab8d4b7d5a1179cdd25fc9cd2b3d79
Component: engine
 2013-11-05 14:28:57 -06:00
Tehmasp Chaudhri 7eaaa6080e (doc) Update ubuntulinux.rst 
small grammar changes - hopefully not worse than original :)
Upstream-commit: 4d5ecdbeb4e428d92c5a0089378f7bae9b3ca3d9
Component: engine
 2013-11-05 12:08:56 -07:00
Victor Vieux a193590012 Merge pull request #2554 from dotcloud/copy-config-on-build 
Use parent image config in buildfile
Upstream-commit: 114e01cdc1457a2a6ceb2288f3d72cbd3614dc8f
Component: engine
 2013-11-05 10:54:49 -08:00
Victor Vieux 9fe5aeedd4 Merge pull request #2517 from gurjeet/patch-2 
Add gurjeet  as an author
Upstream-commit: 7f7926525ac1aa1bd470121dbba22588f95e789e
Component: engine
 2013-11-05 10:52:54 -08:00
Solomon Hykes 5d5633048a Engine: optional environment variable 'Logging' in 'serveapi' 
Upstream-commit: 02ddaad5d985186eed94dea4105a57fa21ba24db
Component: engine
 2013-11-05 18:39:59 +00:00
Solomon Hykes 18c16d13e3 Engine: improved logging and identification of jobs 
Upstream-commit: 4e7cb37dcc18975010df630d8c9580a3a65e0e69
Component: engine
 2013-11-05 18:39:59 +00:00
Solomon Hykes be8463c1d5 Engine: don't export private testing utilities 
Upstream-commit: ca6f0aa107117d2125a63eb5e78d74095bf08a4c
Component: engine
 2013-11-05 18:39:59 +00:00
Solomon Hykes 02af0b7684 Engine: fix a bug which caused handlers to be shared between multiple engine instances 
Upstream-commit: 847411a1ee6e5ee5d051fc4729425215dc0c8561
Component: engine
 2013-11-05 18:39:59 +00:00