toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,423 Commits 3 Branches 295 Tags
e231f0ebed9e69650fc8cd7d05aa17e2ce39149c
Commit Graph
8423 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cyphar 65987d4f80 daemon: *: refactored container resource path generation 
This patch is a preventative patch, it fixes possible future
vulnerabilities regarding unsantised paths. Due to several recent
vulnerabilities, wherein the docker daemon could be fooled into
accessing data from the host (rather than a container), this patch
was created to try and mitigate future possible vulnerabilities in
the same vein.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 0fb507dc2328c5c364a2cd1701a155efb1767a1a
Component: engine
 2014-05-14 11:15:50 +10:00
cyphar 37a49fd371 integration-cli: cp: added tests for cp 
This patch adds integration tests for the copying of resources
from a container, to ensure that regressions in the security of
resource copying can be easily discovered.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 79ca77f3e80d983cf72aa131c1b59c77c60270b0
Component: engine
 2014-05-14 11:14:59 +10:00
cyphar 9a8663f86a daemon: container: ensure cp cannot traverse outside container rootfs 
This patch fixes the bug that allowed cp to copy files outside of
the containers rootfs, by passing a relative path (such as
../../../../../../../../etc/shadow). This is fixed by first converting
the path to an absolute path (relative to /) and then appending it
to the container's rootfs before continuing.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: bfc3a4192ae5723e401470688cdae59b95bd61f1
Component: engine
 2014-05-14 11:14:59 +10: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 40fe9434ea Add a mention of 80 column lines and reflow the document to hide the 
evidence.

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 195f3a3f42ac8894ade9e3dbf8f02945781b6ace
Component: engine
 2014-05-14 10:22:55 +10: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
Vincent Batts 709dba8721 tarsum: test gofmt 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: cfd1227e91d54cca533a73cb7d12c124c7c934af
Component: engine
 2014-05-13 15:14:32 -04:00
Vincent Batts 749eeee77f tarsum: adding the layer for "scratch" image 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: efa369a6ee89722ace2e85aad91c69ddf37985c5
Component: engine
 2014-05-13 15:08:48 -04: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
Vincent Batts df579e2ee6 tarsum: start a test for TarSum 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 461f801f832b1ecbe527999e05dc0bede6ca6c71
Component: engine
 2014-05-13 14:57:31 -04: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
SvenDowideit 267e5e63e1 tell the user not to run from OSX 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: fe445a2447e701cc91ef77d7bcb0978a5d373940
Component: engine
 2014-05-13 12:51:00 +10: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 aba2e9f1f5 move acceptconnections as builtin 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 937f8f2d813f58480e4bb2c0060353be31b04e10
Component: engine
 2014-05-13 01:53:38 +00:00
Victor Vieux cb8e10ccdc make listen buffer optional 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: f3736265fdddef9e9a9ab588906eeb7abe8a0cf6
Component: engine
 2014-05-13 01:51:41 +00: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
Michael Crosby d39f282a2b Move duration and size to units pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d33b4655c4339dcbbf9f78948598e216ac3c06b4
Component: engine
 2014-05-12 17:05:07 -07:00
Michael Crosby cbbfe1274a Fix port mapping in ps display for public and private 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d54dec4d8b6f36fa9211e7a3379f7e949c40b0ce
Component: engine
 2014-05-12 15:26:23 -07: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
Jason Hall f59da8d68c Update google.md 
Fix numbering resets after code sample blocks
Upstream-commit: 3e636446c3a9de24b5b990988e0bd4890277df61
Component: engine
 2014-05-12 14:48:03 -04: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