Commit Graph

8146 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
5bdee3011a runmetrics update, linking to collectd plugin rather than just hinting
Upstream-commit: 79f234e049c72e0cac97bbd93815f33a919eaf1b
Component: engine
2014-05-12 20:51:40 +02:00
8c86f99ef3 Cleaned up Network settings overview
Upstream-commit: feb42d3f97f3a4de9317f17297c6277fcb0cc2af
Component: engine
2014-05-12 20:35:18 +02:00
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
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
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
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
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
9844c82806 libcontainer: Create dirs/files as needed for bind mounts
If you specify a bind mount in a place that doesn't have a file yet we
create that (and parent directories). This is needed because otherwise
you can't use volumes like e.g. /dev/log, as that gets covered by the
/dev tmpfs mounts.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 70ef53f25e177e42046170ef59bb29ebd77a3016
Component: engine
2014-05-12 09:57:15 +02:00
a0faa3873c reduce cache time to 1 hours so future docs releases update the cloudfront caches faster
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 1dec8fd03c4f9c99491d3019f56772cccaf100fd
Component: engine
2014-05-12 11:31:44 +10:00
57c8245b81 Give the Redirect a HostName - filled in from the s3 bucket name.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 0d59cc080a8dc115bdb727d376e3965e58109718
Component: engine
2014-05-12 10:31:27 +10:00
7a283742d2 Integration test for link and unlink containers
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 7cc27b2075d6293ab2f54a7255fcb1b1e062fd91
Component: engine
2014-05-11 21:33:01 +01:00
c178af9458 Use int64 instead of int
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 62bfef59f7ae6f9128bfc3e7ef2e6ed5e4441d2e
Component: engine
2014-05-11 06:23:53 -07:00
4b636334e3 Remove signal_freebsd (already in pkg/signal)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 3f8ffb461ab66535b3c3a96a564c06db12a27281
Component: engine
2014-05-11 01:03:12 -07:00
b2601c1b63 Fix bug on LXC container start. Fixes #5718
Docker-DCO-1.1-Signed-off-by: Fernando Mayo <fernando@tutum.co> (github: fermayo)
Upstream-commit: 752c57ae567813f354aca66ff51d8d64100ae01b
Component: engine
2014-05-10 18:05:02 -04:00
ee7f537ba7 Merge pull request #5716 from shykes/pr_out_engine_receiver_and_sender_preserve_job_env
Upstream-commit: 5877ae24624ccca38b5d54a187db6951cce10d78
Component: engine
2014-05-09 19:47:32 -07:00
fcaf06384b Merge pull request #5432 from shykes/image-subsystem-1
Upstream-commit: 4dc16ab54613a75865c06296e7155e03e9b30a63
Component: engine
2014-05-09 19:19:33 -07:00
910a692b37 Start separating the image subsystem
This is a first step towards moving all code related to local
manipulation of images into a cleanly separated subsystem,
accessible via a stable set of commands in the engine API.

`graph.TagStore` now implements `engine.Installer`. For now, it
is installed by `Server.InitServer`, along with all other Server
commands. However this will change in future patches.

`graph.TagStore.Install` registers the following commands:

* `image_set` creates a new image and stores it locally.
* `image_get` returns information about an image stored locally.
* `image_tag` assigns a new name and tag to an existing image.

These commands are a pre-requisite for moving 'push' and 'pull'
out of `Server`.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ff4ef504708bfaa51d4d361455689a21a031cc35
Component: engine
2014-05-09 19:15:26 -07:00
fafa044284 Merge pull request #5635 from vbatts/vbatts-registry_maintainers
Upstream-commit: d6e666a87a01a5634c250358a94c814bf26cb778
Component: engine
2014-05-09 19:07:25 -07:00
2dde49a607 Dockerfile: updated ubuntu release used for builds
This patch just revs the Ubuntu release used for builds from 13.10
to 14.04.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 46a47f0dcbce1a4240bc970388dd09d029f82f61
Component: engine
2014-05-10 11:38:12 +10:00