Commit Graph

7545 Commits

Author SHA1 Message Date
c707e115bd Merge pull request #5657 from tianon/sysvinit-should-start
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
Upstream-commit: 8904dfe08217c82a3985d85448dafe8917cb0c41
Component: engine
2014-05-14 16:05:32 -06:00
65c03fb72f Merge pull request #5807 from crosbymichael/dev-symlinks
Setup standard /dev symlinks
Upstream-commit: 76f09c2ecf06d81b885124bcb3d605096f75f562
Component: engine
2014-05-14 14:17:33 -07:00
9e5b34ae82 Merge pull request #5806 from icecrime/5766-events_endless_newlines
Issue #5766 - Check channel closed state in /events loop
Upstream-commit: 49deffe6fe53b8a83a75a78cb80f5ec8d205c8eb
Component: engine
2014-05-14 14:09:26 -07:00
77c903866a Merge pull request #5805 from joelhandwell/patch-2
changed deprecated -name option to --name
Upstream-commit: 343c24a5faa6b92897349eca212f04260a48886c
Component: engine
2014-05-14 22:09:17 +01:00
9fb5971b01 Merge pull request #5804 from joelhandwell/patch-1
changed deprecated -rm option to --rm
Upstream-commit: 79be9f8d7f316f222f0482e233b6e0d2691e214f
Component: engine
2014-05-14 22:08:01 +01:00
66a02eb50b Setup standard /dev symlinks
After copying allowed device nodes, set up "/dev/fd", "/dev/stdin",
"/dev/stdout", and "/dev/stderr" symlinks.

Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
[rebased by @crosbymichael]
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2bc34036b9106318f8564ee36b696ad070b02573
Component: engine
2014-05-14 13:59:13 -07:00
785f4eb416 Check channel closed state in /events loop
When listener channel is closed, it becomes always available for
reading: select becomes an active loop which writes default-constructed
events (i.e: empty strings).

Fixes #5766.

Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <arnaud.porterie@gmail.com> (github: icecrime)
Upstream-commit: 8699f53e6a033a7b5b55a2b6356da7c6e220d01f
Component: engine
2014-05-14 22:35:04 +02:00
1394048dd1 Merge pull request #5783 from LK4D4/fix_duplicate_ip_allocation_#5729
Fix duplicate ip allocation
Upstream-commit: 17a1f470ae3e6f1d7a7c4545983e37bfcfe981ab
Component: engine
2014-05-14 13:32:27 -07:00
68f263f160 changed deprecated -name option to --name
changed deprecated -name option to --name
Upstream-commit: 2d622df835f8c80b213a68bbceef21fb003a9a6a
Component: engine
2014-05-14 16:24:08 -04:00
89b28579db changed deprecated -rm option to --rm
changed deprecated -rm option to --rm
Upstream-commit: 137f4b326ad1669cd562fa59d809f39d21b653fe
Component: engine
2014-05-14 16:22:38 -04:00
dda972255c Merge pull request #5720 from cyphar/5656-cp-absolute-paths
Ensure `docker cp` cannot traverse outside container rootfs
Upstream-commit: 4af465fccf35d0c9e529f02f6cc9c8be9fc81c68
Component: engine
2014-05-14 11:46:11 -07:00
2b662e5ee6 Merge pull request #5752 from crosbymichael/fix-port-mapping-ps
Fix port mapping in ps display for public and private
Upstream-commit: d066ceaa4f2d27f9d8baea56498934f8b57d5de7
Component: engine
2014-05-14 11:36:23 -07:00
94d0641f06 Merge pull request #5756 from crosbymichael/move-units-to-pkg
Move duration and size to units pkg
Upstream-commit: bc22c9948c5380715338aef63fcc6cccd1a16bd7
Component: engine
2014-05-14 11:36:14 -07:00
329fd9ed83 Merge pull request #5780 from vbatts/vbatts-start_tarsum_test
tarsum: start a test for TarSum
Upstream-commit: c78b390b6cf6d8d17fe2206a1e84456467457694
Component: engine
2014-05-14 11:28:26 -07:00
750dbc4d7c Merge pull request #5787 from SvenDowideit/pr_out_add_a_mention_of_80_column_lines_and_reflow_the_document_to_hide_the_evidence
Add a mention of 80 column lines and reflow the document to hide the evidence.
Upstream-commit: d9b1c1976ff7343a04c030399ef879430e78226b
Component: engine
2014-05-14 20:13:48 +02:00
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
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
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
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
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
d94c5fdcb0 tarsum: adding benchmarks
to cover a couple of use-cases:
* 1mb file, using no compression
* 1mb file, using compression
* 1024 1k files, using no compression
* 1024 1k files, using compression

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: d153740d9c7d672b9433f173b9a098a5d3c14c53
Component: engine
2014-05-14 11:48:17 -04:00
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
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
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
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
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
3b48f8f4bc Change ip allocation logic
Now IP reuses only after all IPs from network was allocated
Fixes #5729

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 80fca061e7661549a05b2696488db3fea008e2dd
Component: engine
2014-05-14 06:43:10 +04:00
0291829e72 Refactoring collections/orderedintset and benchmarks for it
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 5128feb690e8fd0244d1fecef5f3f5f77598bbfa
Component: engine
2014-05-14 06:04:12 +04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
bd987eeae1 Fix a typo in contrib/man/md/docker.1.md
Upstream-commit: 653328c6cef8bab89343587b134ba7676ee39867
Component: engine
2014-05-13 11:17:42 +02:00
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
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
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
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
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
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