toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,261 Commits 3 Branches 295 Tags
9195f7ed61fe056e65a541a29fe935350f2b6308
Commit Graph

8261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
unclejack
9195f7ed61 integcli: resolve full path to docker binary 
Setting dockerBinary to the full path of the Docker binary is a good
idea and this is now done in the test code.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 46578a2359714e32d61af4efaeea86b7ff770359
Component: engine
 2014-05-17 02:38:28 +03:00
Guillaume J. Charmes
4d36898842 Merge pull request #5851 from proppy/archive-simple-detect 
archive: simplify DetectCompression
Upstream-commit: 6f651ec62bdb7b00dc286414c1807a4ae4216058
Component: engine
 2014-05-16 16:32:55 -07:00
Michael Crosby
add055e2b6 Merge pull request #5822 from creack/update_vendors 
Update archive/tar vendored
Upstream-commit: eb61a1f73a979cc12e5ec1e6f451ec4dc4e37817
Component: engine
 2014-05-16 16:31:37 -07:00
Johan Euphrosine
25b0a0131e archive: add missing bytes package 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 4a3aefbb5232433098c9d27423a10031eb17ff93
Component: engine
 2014-05-16 16:26:28 -07:00
Johan Euphrosine
1976c1713a archive: fix panic if len(source) < len(m) 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 67ce59a806007cd28d96fd11208c4a113d1b92e0
Component: engine
 2014-05-16 16:25:56 -07:00
Johan Euphrosine
c1c5dca31c archive: simplify DetectCompression 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 3118952e0a63b42b830fc846a56b891d14902976
Component: engine
 2014-05-16 16:25:56 -07:00
Michael Crosby
379b590f9f Merge pull request #4882 from vieux/fix_merge_issue_tty 
Fix merge issue tty
Upstream-commit: 58b49e60bbd3d9d978ecf3e96f53b47fdcca8cce
Component: engine
 2014-05-16 15:42:43 -07:00
Victor Vieux
8003cf19d2 do not merge -i or -t options 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 2c8b63cb754128a64083426e5c3e6016118e78df
Component: engine
 2014-05-16 22:31:16 +00:00
Victor Vieux
a03989227c add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 366f084eb0864db6dcf5cc47e434b3c6f43500d7
Component: engine
 2014-05-16 22:23:32 +00:00
Victor Vieux
ed8430a340 Merge pull request #5571 from vieux/fix_race_docker_daemon 
Fix race docker daemon
Upstream-commit: 00ce30bc7473b389579a44e55a01c818ebae84e1
Component: engine
 2014-05-16 13:57:43 -07:00
Victor Vieux
4dfcc75b6e Merge pull request #5853 from proppy/update-tarfilter-comment 
archive: update TarFilter comments
Upstream-commit: 1adc2fa533ad86be3ff3e122feaa3d798f130a2e
Component: engine
 2014-05-16 13:06:12 -07:00
Victor Vieux
0eaa2babd7 Merge pull request #5436 from hobofan/master 
reapply Cmd value even if CmdAdd returns early
Upstream-commit: 4b587ac118284fbbc9b10c20319b2dd8c20d4b4f
Component: engine
 2014-05-16 12:45:23 -07:00
Johan Euphrosine
3f955b3cac archive: update TarFilter comments 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 311614952ea64315075d827c880debbdfb503640
Component: engine
 2014-05-16 12:44:42 -07:00
Michael Crosby
538811ef9a Merge pull request #5833 from ActiveState/fix_nsinit_env_panic 
fix panic when passing empty environment
Upstream-commit: 62c3183fc88779479905df8c2f7561c46a08d2ee
Component: engine
 2014-05-16 12:03:26 -07:00
Sridhar Ratnakumar
919aaa7d95 fix panic when passing empty environment 
Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name> (github: srid)
Upstream-commit: d787f2731e4242f244e88f047032ad9650f1f8d7
Component: engine
 2014-05-16 11:55:34 -07:00
Victor Marmol
25e8afd42a Merge pull request #5810 from vmarmol/drop-caps 
Change libcontainer to drop all capabilities by default.
Upstream-commit: 01d10d6f13d62d74f850fea2a685b24b7983244e
Component: engine
 2014-05-16 11:51:41 -07:00
Michael Crosby
44fdfa90b2 Merge pull request #5396 from lalyos/5370-infinite-loop-caused-by-symlink 
5370 infinite loop caused by symlink
Upstream-commit: 23062e55fd0eb75f28ff74e3de46bc3e15b0280f
Component: engine
 2014-05-16 11:28:37 -07:00
Victor Vieux
c2681da5e2 Merge pull request #5841 from unclejack/run_pull_latest 
run: pull only latest when no tag specified
Upstream-commit: 808d28033b981188a3856098e9e3d6b96a9b9a53
Component: engine
 2014-05-16 11:21:29 -07:00
Michael Crosby
1bc76e2712 Merge pull request #5842 from alexlarsson/dm-cleanup-tests 
devicemapper: Remove non-general tests
Upstream-commit: dbd6f10b3d1aa4b2e85e3a2536a5fd4b754c1deb
Component: engine
 2014-05-16 11:08:04 -07:00
Victor Vieux
4549210429 Merge pull request #5837 from proppy/patch-2 
server/buildfile: correct daemon.Create comments
Upstream-commit: 2b3b03b596a773fed0527a4617deb834ecd000e8
Component: engine
 2014-05-16 10:51:09 -07:00
Johan Euphrosine
c6f81b2d5f server/buildfile: correct daemon.Create comments 
s/and start it//

Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 8b31824ad6118ed505b43443816c1492e3d81c8c
Component: engine
 2014-05-16 10:50:02 -07:00
Victor Vieux
990bb5ea3a Merge pull request #5838 from timthelion/patch-1 
Typo in execdrivers.go five => give
Upstream-commit: 021ac36a70048074e752988a7a8789c02c701b17
Component: engine
 2014-05-16 10:49:44 -07:00
Tianon Gravi
f1c91438e8 Merge pull request #5840 from unclejack/upstart_mounted 
Update contrib/init/upstart to "start on local-filesystems"
Upstream-commit: 6dd4fa0b74fac2abf5ebf03c1cc89d5d7d03da1b
Component: engine
 2014-05-16 10:16:34 -06:00
unclejack
cdfe67b94e contrib/init/upstart: start on local-filesystems 
This changes the upstart init script to start on `local-filesystems`.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: ba0c8292917560b45f840f187c2a8f452550705d
Component: engine
 2014-05-16 19:12:59 +03:00
unclejack
3e603cbd49 run: pull only latest when no tag specified 
This makes Docker pull only the image tagged as latest when no tag has
been specified. This makes Docker pull only the image it'll run.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: b8e338144e90a6bb76110ab04cc216966640a3f4
Component: engine
 2014-05-16 15:23:47 +03:00
Alexander Larsson
e3a28edbe2 devmapper: Remove sys.go mocking framework 
This is no longer needed, as the tests are gone.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 39d244a593aad63be58d8b2e452715e25135f255
Component: engine
 2014-05-16 14:12:56 +02:00
Timothy Hobbs
2ef3480938 Typo in execdrivers.go five => give 
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: 408f050d648da0b64d353146a1be59827d76bf70
Component: engine
 2014-05-16 11:45:20 +00:00
O.S. Tezer
de83ad1721 Merge pull request #5828 from SvenDowideit/pr_out_update_the_cli_md_docs_with_the_output_of_the_docker_command 
Update the cli.md docs with the output of the docker command
Upstream-commit: c4fc591fbe5cdc7a3b02fe1cfa293d57ce020565
Component: engine
 2014-05-16 12:10:55 +01:00
Alexander Larsson
130a91328f devicemapper: Remove non-general tests 
Now that we have the generic graphtest tests that actually tests
the driver we can remove the old mock-using tests. Almost all of
these tests were disabled anyway, and the four remaining ones
didn't really test much while at the same time being really
fragile and making the rest of the code more complex due to
the mocking setup.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bd6fd25dfb4cf7aae0e5e382e3bf10c9b2caa5fb
Component: engine
 2014-05-16 12:46:28 +02:00
Victor Marmol
48bd5989f0 Change libcontainer to drop all capabilities by default. Only keeps 
those that were specified in the config. This commit also explicitly
adds a set of capabilities that we were silently not dropping and were
assumed by the tests.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 9d6875d19d3926faf6287487234ad0b2f1310e9d
Component: engine
 2014-05-16 00:57:58 +00:00
Michael Crosby
e41b5598f3 Merge pull request #5497 from alexlarsson/generic-driver-tests 
graphdriver: Add generic test framework for graph drivers
Upstream-commit: 08a7bcf5dbb093900ddfd1f300a8bbd97bced507
Component: engine
 2014-05-15 17:21:09 -07:00
Guillaume J. Charmes
e6ed9607f5 Merge pull request #5454 from kzys/utime-omit 
UTIME_OMIT is only available on Linux
Upstream-commit: 4353ee78e8614779012b2f24d79a46fa352739b8
Component: engine
 2014-05-15 17:18:37 -07:00
Solomon Hykes
091a0d0e78 Merge pull request #5461 from SvenDowideit/getmaintainers.sh 
Upstream-commit: 87fc7130a4860e1eb46469329b37bb1ce9c9c744
Component: engine
 2014-05-15 17:15:40 -07:00
Sven Dowideit
b123613728 Merge pull request #5802 from shykes/pr_out_add_licensing_information_to_readme 
Add Licensing information to README
Upstream-commit: 6297f333bdfe460dd2724d80c7c454ac694a8ed3
Component: engine
 2014-05-16 10:08:46 +10:00
Sven Dowideit
3f6b5f9920 Merge pull request #5732 from SvenDowideit/pr_out_the_last_remaining_raw_github_com_url_s 
the last remaining raw.github.com URL's
Upstream-commit: 8da44c9b2a3f4ad56df28bd47699b552bdc68a5d
Component: engine
 2014-05-16 10:01:14 +10:00
SvenDowideit
98235fb032 Update the cli.md docs with the output of the docker command 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: d35330bb7aa8473b92f6f45718aa6c38863cccc7
Component: engine
 2014-05-16 10:00:20 +10:00
Guillaume J. Charmes
a00e014556 Merge pull request #5823 from proppy/archive-bufio 
archive: use bufio for compression detection
Upstream-commit: 924aa984cf9ded2b49ccc9079ce69c96b3d64041
Component: engine
 2014-05-15 16:08:21 -07:00
lalyos
dba2ddd068 Fixes 5370 infinite/maxLoopCount loop for relative symlinks 
use path.IsAbs() instead of checking if first char is '/'

Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
Upstream-commit: ad35d522dbfac124225e27f58bf07c61a34d78b5
Component: engine
 2014-05-16 01:03:11 +02:00
lalyos
1092af80f9 Defend against infinite loop when following symlinks 
ideally it should never reach it, but there was already multiple issues with infinite loop
at following symlinks. this fixes hanging unit tests

Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
Upstream-commit: b51c366bfc963687b8cc14df614a2fc10bad6306
Component: engine
 2014-05-16 00:47:20 +02:00
lalyos
28ce705ffc Adding test case for symlink causes infinit loop, reproduces: dotcloud#5370 
normally symlinks are created as either
ln -s /path/existing /path/new-name
or
cd /path && ln -s ./existing new-name

but one can create it this way
cd /path && ln -s existing new-name

this drives FollowSymlinkInScope into infinite loop

Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
Upstream-commit: 8b77a5b7aedb1168707f486ed540edf3e5de8819
Component: engine
 2014-05-16 00:47:20 +02:00
Guillaume J. Charmes
30441260af Add test for invalid tarball read 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: aedcb76adc2b2468565b311b67f4079a128b37cd
Component: engine
 2014-05-15 15:45:40 -07:00
Guillaume J. Charmes
f5e7688aff Update archive/tar vendored 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 094926206bc98718f2eac95849e57439155d7c6c
Component: engine
 2014-05-15 15:40:26 -07:00
James Turnbull
b6abf23396 Merge pull request #5820 from joelhandwell/patch-1 
changed deprecated option styles to supported ones
Upstream-commit: e5a5808f51e5e6fbd11aec2242ee7bd5991c201f
Component: engine
 2014-05-16 00:40:16 +02:00
Victor Vieux
2a3784982d Merge pull request #5826 from tianon/add-cross-to-test 
Add "cross" to the "test" Makefile target
Upstream-commit: 041dbcb7beba008392b2b36405638a7490b37d58
Component: engine
 2014-05-15 15:35:18 -07:00
Tianon Gravi
3bd2cdddb8 Add "cross" to the "test" Makefile target 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 8ec01f9dc1d18c532f60f1bfb6c0ab5eea378b3c
Component: engine
 2014-05-15 16:21:17 -06:00
Johan Euphrosine
e8ae384f46 archive: use bufio for compression detection 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 77c2b76e44f77eee2ca89ff551ac64f8c6b8bd23
Component: engine
 2014-05-15 11:41:07 -07:00
Joel Handwell
4cab943cdb changed deprecated option styles to supported ones 
-name and -rm to --name and --rm
Upstream-commit: 10a320818e875547c83fecea32cd73231248acf8
Component: engine
 2014-05-15 10:50:59 -04:00
Sven Dowideit
3c12725112 Merge pull request #5816 from unclejack/docs_run_cache 
docs: explain when RUN cache gets invalidated
Upstream-commit: 5dfe7c43d47276fd0b63993058fbcc424370329a
Component: engine
 2014-05-15 19:54:15 +10:00
unclejack
f038890332 docs: explain when RUN cache gets invalidated 
This adds a few lines to the RUN Dockerfile docs to explain how to
bypass the RUN caching and how ADD can also invalidate the cache for
these instructions.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 239d1ef301eb8d9b2b1e8469489b25ff3708f47f
Component: engine
 2014-05-15 12:32:01 +03:00
Sven Dowideit
3f28a1f79c Merge pull request #5762 from SvenDowideit/pr_out_add_some_more_specific_help_for_dockerfile_build_contexts 
Add some more specific help for Dockerfile build contexts.
Upstream-commit: 8887e0063014228dbf3ff85083019adca4537ec0
Component: engine
 2014-05-15 11:03:22 +10:00