toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,158 Commits 3 Branches 295 Tags
a35af4d49f82b998178b0d791589708bec5023cb
Commit Graph
8158 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby a35af4d49f Merge pull request #5798 from unclejack/fix_startup_speed 
don't update Suffixarray for every Register during startup
Upstream-commit: de406b69f31841b20d47f5df159df3d2d092236e
Component: engine
 2014-05-14 11:13:02 -07:00
Michael Crosby ffbe025292 Merge pull request #5791 from bernerdschaefer/nsinit-exec-forwards-signals 
"nsinit exec ..." forwards signals to container
Upstream-commit: 432e42e7154ddc97e57783778a02edb5a95bfaa0
Component: engine
 2014-05-14 11:05:27 -07:00
Victor Vieux 1bdce7b716 Merge pull request #5781 from creack/remove_bind_console 
Remove the bind mount for dev/console which override the mknod/label
Upstream-commit: 3bf1b562e39bed0a4ecdad9b23c6274b80bdc82d
Component: engine
 2014-05-14 10:57:21 -07:00
unclejack 07e7377c7d Merge pull request #5758 from crosbymichael/add-cpuset 
Add cpuset cpus support for docker
Upstream-commit: fc82199d4f013bedeee3793bcca61c9e554b0357
Component: engine
 2014-05-14 20:57:12 +03:00
Victor Vieux f0b9234104 Merge pull request #5794 from unclejack/speed_up_ps 
don't call sort for every add in daemon/history
Upstream-commit: b561f0398a28b3c648310eb8349b1f65c2fb28d5
Component: engine
 2014-05-14 10:48:08 -07:00
unclejack 36853439a8 update Suffixarray only once during daemon startup 
This commit makes the Docker daemon call UpdateSuffixarray only after
it finishes registering all containers.

This lowers the amount of time required for the Docker daemon to start
up.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 5d5c89398c39e2f38459aae42189c9ca1125c1d3
Component: engine
 2014-05-14 17:58:37 +03:00
unclejack bc13a475f8 add UpdateSuffixarray and refactor TruncIndex 
This commit refactors TruncIndex to make it possible to add container
ids to the TruncIndex without updating the Suffixarray.

This is useful during the Docker daemon's startup when we don't want to
update the Suffixarray for every container we add.

Add continues to function like before.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 219b7ae8b526bb5e6d0e27176308db71438a002f
Component: engine
 2014-05-14 17:57:59 +03:00
unclejack 2809f19cbb don't call sort for every add in history 
This moves the call to sort in daemon/history to a function to be
called explicitly when we're done adding elements to the list.

This speeds up `docker ps`.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: e963179c790ec49b28fae0d7ebc0d9d2b3ac0b72
Component: engine
 2014-05-14 15:02:02 +03:00
Bernerd Schaefer 64ee7b470d "nsinit exec ..." forwards signals to container 
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
Upstream-commit: 830c2d7fa3f19a2fba50464273ae19cd2113e689
Component: engine
 2014-05-14 11:01:02 +02:00
James Turnbull e200b4a6f7 Merge pull request #5785 from SvenDowideit/pr_out_subject_and_object_containers_can_be_confused 
Subject and object containers can be confused
Upstream-commit: cb0f2a2823be749a19780b3b818f22fd61adeacd
Component: engine
 2014-05-14 07:56:31 +02:00
Michael Crosby 4926e35bb1 Add cpuset cpus support for docker 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: adbe3096e8c8572925dbae5f19ac2ce2dc84fb1c
Component: engine
 2014-05-13 18:17:12 -07:00
Michael Crosby 73a783a20c Merge pull request #5786 from crosbymichael/cpuset-copy 
Copy parents cpus and mems for cpuset
Upstream-commit: 4de6810be951541617686887b9ca07e822034b62
Component: engine
 2014-05-13 18:16:47 -07:00
Michael Crosby 396c5aa745 Copy parents cpus and mems for cpuset 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3de15bda7e1d3ab193094e6e07a5b2e42ea828bd
Component: engine
 2014-05-13 18:01:31 -07:00
SvenDowideit eb9c7bf12e Subject and object containers can be confused 
and `create` is now a loaded word for some readers

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: af891a67516149c4db490018430114c137cba9db
Component: engine
 2014-05-14 07:43:41 +10:00
Guillaume J. Charmes 435045ce97 Remove the bind mount for dev/console which override the mknod/label 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: ae85dd54582e94d36b146ab1688844ed58cc8df3
Component: engine
 2014-05-13 11:59:27 -07:00
Victor Vieux 592230c928 Merge pull request #5778 from crosbymichael/check-symlink 
Ensure libcontainer follows correct symlink in scope
Upstream-commit: f637eaca5daad914dfb42dadd535502ad82eb264
Component: engine
 2014-05-13 11:28:00 -07:00
Michael Crosby 057bbc9d6a Add MAINTAINERS file to symlink pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ea7647099fcabd73077a403d461e9a0778dda12f
Component: engine
 2014-05-13 11:27:24 -07:00
Michael Crosby 740073112a Update code to handle new path to Follow Symlink func 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ca040b1a377c467a9504ffa256ae77d9e3d29f0c
Component: engine
 2014-05-13 10:54:08 -07:00
Michael Crosby 7c5b416146 Move Follow symlink to pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: dcf81f95fdfe3ac8e97602d2ef2fef03288c15b1
Component: engine
 2014-05-13 10:35:57 -07:00
Alexander Larsson 23ad200555 libcontainer: Ensure bind mount target files are inside rootfs 
Before we create any files to bind-mount on, make sure they are
inside the container rootfs, handling for instance absolute symbolic
links inside the container.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: b7c7b851dce28bb679e0289168da382d7cdad74b
Component: engine
 2014-05-13 10:24:52 -07:00
Sven Dowideit 4e056dedf6 Merge pull request #5769 from dankeder/master 
Fix a typo in contrib/man/md/docker.1.md
Upstream-commit: 1d4caadfe2176f8d95bb1fdc032416eacf300e40
Component: engine
 2014-05-13 20:26:02 +10:00
Dan Keder bd987eeae1 Fix a typo in contrib/man/md/docker.1.md 
Upstream-commit: 653328c6cef8bab89343587b134ba7676ee39867
Component: engine
 2014-05-13 11:17:42 +02:00
Sven Dowideit 48f6f4f0d1 Merge pull request #5745 from ojilles/patch-1 
Cleaned up Network settings overview
Upstream-commit: a70bffd382e26342dfe26d6bb8ca39ee7f498f33
Component: engine
 2014-05-13 19:02:18 +10:00
unclejack 84adeaa2ea Merge pull request #5655 from alexlarsson/mount-run-dir 
Always mount a /run tmpfs in the container
Upstream-commit: f1eabe436a1d40f5e3285b5df955297c49441874
Component: engine
 2014-05-13 11:51:14 +03:00
Solomon Hykes b4b52a951a Merge pull request #5753 from creack/fix-beam-32bit 
[beam] Use direct iota instead of binary shift
Upstream-commit: ee4fa10fb018b30312dce86592ae6e23f0d588f2
Component: engine
 2014-05-13 00:21:32 -07:00
James Turnbull 4b985838ad Merge pull request #5757 from SvenDowideit/pr_out_was_checking_something_for_a_pr_and_noticed_some_quote_issues 
Was checking something for a PR and noticed some quote issues
Upstream-commit: 5ac3c6c4ed64ad4eddc10e3a73f7a52f1fc5d8dc
Component: engine
 2014-05-13 06:37:12 +02:00
Michael Crosby e16fbae9ed Merge pull request #5707 from vieux/fix_event_removal 
fix event removal
Upstream-commit: 5b525feaed4b8452b55b71119a25d1e0914e4f8f
Component: engine
 2014-05-12 18:59:42 -07:00
Victor Vieux 8be3a4d5df Merge pull request #5759 from vieux/move_register_links_to_daemon 
move RegisterLinks to daemon
Upstream-commit: a0f799b6d407785cb926dde25fdf20e347d58c33
Component: engine
 2014-05-12 18:39:47 -07:00
Victor Vieux e67f6c0388 move RegisterLinks to daemon 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 100a92146e563d39d5a401c11d48e7b4ef7fad6e
Component: engine
 2014-05-13 00:54:46 +00:00
SvenDowideit 4502be2717 Was checking something for a PR and noticed some quote issues 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: b9c2d57d890c0f6a798baf74f7b56793fdf1fd61
Component: engine
 2014-05-13 10:36:19 +10:00
Sven Dowideit 26286a5e37 Merge pull request #5747 from ojilles/patch-2 
runmetrics update, linking to collectd plugin rather than just hinting
Upstream-commit: 3f6ec6ebbad58745cf550b1a914e86b216b6afef
Component: engine
 2014-05-13 10:21:34 +10:00
Guillaume J. Charmes 6db71da5ab Merge pull request #5751 from vieux/move_version 
move version out of server
Upstream-commit: 0d78799db779d867eb8e8d264405a8be21df70ee
Component: engine
 2014-05-12 15:25:40 -07:00
Victor Vieux 7e5ef8d001 move version out of server 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 7894a70f8b2dcb329178978066d825dc41ec6239
Component: engine
 2014-05-12 21:38:20 +00:00
Guillaume J. Charmes d5efcab5ae Merge pull request #5717 from philips/mkdir-in-daemon 
fix(daemon): ensure the /var/lib/docker dir exists
Upstream-commit: bc77ec2b17b6822a5a930cc34ae0d8a32bffc253
Component: engine
 2014-05-12 14:13:56 -07:00
Solomon Hykes 5d29033f6f Merge pull request #5750 from vieux/vieux_server_maintainer 
add vieux as server's MAINTAINERS
Upstream-commit: 43e926cd9c0e943a2474334a6f4855ba0bf754fa
Component: engine
 2014-05-12 13:56:30 -07:00
Victor Vieux 9198004757 add vieux as server's MAINTAINERS 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 1d15c0b491afc6b32206d62ee3f50448b89b8d49
Component: engine
 2014-05-12 20:51:45 +00:00
Michael Crosby 8573b88520 Merge pull request #5696 from cyphar/rev-ubuntu-dockerfile 
Update Ubuntu release used for builds
Upstream-commit: aa1fc36a92748d2e8cf97178adbac4c1391a3484
Component: engine
 2014-05-12 13:21:38 -07:00
Alexander Larsson 23c5da98b4 Always mount a /run tmpfs in the container 
All modern distros set up /run to be a tmpfs, see for instance:
https://wiki.debian.org/ReleaseGoals/RunDirectory

Its a very useful place to store pid-files, sockets and other things
that only live at runtime and that should not be stored in the image.

This is also useful when running systemd inside a container, as it
will try to mount /run if not already mounted, which will fail for
non-privileged container.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 905795ece624675abe2ec2622b0bbafdb9d7f44c
Component: engine
 2014-05-12 21:41:04 +02:00
Michael Crosby ed72957edf Merge pull request #5748 from crosbymichael/libcontainer-bindmounts 
libcontainer: Create dirs/files as needed for bind mounts
Upstream-commit: 30a40de205c6c29ae8e2379c39d69186ef04bf6e
Component: engine
 2014-05-12 12:27:18 -07:00
Michael Crosby fba87d75f1 Remove newline char in error message 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cc678a7078b417a330e8d4e3604b74f9e5d4cda4
Component: engine
 2014-05-12 12:24:30 -07:00
Michael Crosby 070a4a39ce Merge pull request #5724 from tutumcloud/5718-lxcbugfix 
Fix bug on LXC container start. Fixes #5718
Upstream-commit: 243eaac8b62e4f4ea277b91658b8783496789469
Component: engine
 2014-05-12 12:14:57 -07:00
Michael Crosby fa311d2f9f Merge pull request #5712 from vishh/fix_typo 
Correct a libcontainer Mount Namespace setup comment.
Upstream-commit: 16fe76e7708699d7b96baf90379d74eb6ecbe8ad
Component: engine
 2014-05-12 12:07:19 -07:00
Vishnu Kannan 616f1c2db1 Correct a comment in libcontainer Mount Namespace setup. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: fee1bbd79ef8767ed149c1b1af4a39ad35e07772
Component: engine
 2014-05-12 19:01:36 +00:00
Jilles Oldenbeuving 5bdee3011a runmetrics update, linking to collectd plugin rather than just hinting 
Upstream-commit: 79f234e049c72e0cac97bbd93815f33a919eaf1b
Component: engine
 2014-05-12 20:51:40 +02:00
Jilles Oldenbeuving 8c86f99ef3 Cleaned up Network settings overview 
Upstream-commit: feb42d3f97f3a4de9317f17297c6277fcb0cc2af
Component: engine
 2014-05-12 20:35:18 +02:00
unclejack 0e45fa5891 Merge pull request #5729 from fabiofalci/link_unlink_test 
Integration test for link and unlink containers
Upstream-commit: 4c065069942fd17cf074ffd312677dae5ba43fc2
Component: engine
 2014-05-12 21:06:03 +03:00
Victor Vieux ee43782186 Merge pull request #5741 from creack/remove_unused_file-2 
Remove signal_freebsd (already in pkg/signal)
Upstream-commit: 34b7e352ebdbcdb4a20c6c078026e242565a2de4
Component: engine
 2014-05-12 10:47:45 -07:00
Thatcher 8cb5d72505 Merge pull request #5621 from ostezer/docs-add-pardot 
Add code for Pardot implementation to docs
Upstream-commit: 27a39bfd1a45e94e3935f9b57db2c072db27ce2c
Component: engine
 2014-05-12 09:18:12 -07:00
O.S. Tezer 5a665531c0 Merge pull request #5731 from SvenDowideit/reduce-cache-max-age 
reduce cache time to 1 hours so future docs releases update the cloudfront caches faster
Upstream-commit: 0f88dbd7447f0c21853549c2a496cd1601678795
Component: engine
 2014-05-12 17:05:55 +01:00
O.S. Tezer 1b3597ec6f Merge pull request #5730 from SvenDowideit/fix-hostname-for-redirects 
Give the Redirect a HostName - filled in from the s3 bucket name.
Upstream-commit: 8700d68b1944a52d4138da5079940f73d66c8dfd
Component: engine
 2014-05-12 15:03:03 +01:00