Commit Graph

5683 Commits

Author SHA1 Message Date
deaadc8b56 fix underline/heading
Upstream-commit: c76a4e34896fd0785cf982372a3713c4ef70754b
Component: engine
2014-02-11 16:19:42 -08:00
c649008597 Merge pull request #4020 from cameronboehmer/patch-1
add vm port forwarding note/example in osx install docs
Upstream-commit: 3122b4b470168ead70a84ff2594aa32c0619e08c
Component: engine
2014-02-11 16:18:54 -08:00
7abeabe543 Merge pull request #4072 from 13W/patch-1
Update remote_api_client_libraries.rst
Upstream-commit: 0bcabdbdc79472d7e6c56498c8ae06413730d270
Component: engine
2014-02-11 16:14:22 -08:00
27e1a5f0fd Merge pull request #4035 from SvenDowideit/dont-env-debian-frontend
point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
Upstream-commit: 9176b6fd883158e3420777e6e2d463ddcf2005ab
Component: engine
2014-02-11 15:59:10 -08:00
231362cb9e add port forwarding notes for mac/boot2docker docs
Docker-DCO-1.1-Signed-off-by: Cameron Boehmer <cameron.boehmer@gmail.com> (github: cameronboehmer)
Upstream-commit: 49b928c0b05852b58881ce8ebdb164db92befd3a
Component: engine
2014-02-11 15:26:12 -08:00
33338e981d Update remote_api_client_libraries.rst
hello, add please my interface

Docker-DCO-1.1-Signed-off-by: Vladimir <xx@ccxx.cc> (github: 13w)
Upstream-commit: d35b03ef8db9d773937133277cc16364a551ab74
Component: engine
2014-02-12 01:09:06 +02:00
b3dbf3da06 Merge pull request #4067 from alexlarsson/fix-devmapper-race
Avoid extra mount/unmount during container registration
Upstream-commit: da3e53913388ebc89066bb5de06bcebc2e6c5854
Component: engine
2014-02-11 17:13:33 -05:00
87fd3e0884 Merge pull request #4055 from alexlarsson/remove-devmapper-dirs
devmapper: Remove directory when removing devicemapper device
Upstream-commit: a66124ec6aab77ed984896773c9d37b7b343c47f
Component: engine
2014-02-11 17:05:56 -05:00
56af3b233d Merge pull request #4049 from vieux/fix_commit
fix --run in docker commit
Upstream-commit: 2a9a83cf94b6d45604bdf75a5fe4a745960170a9
Component: engine
2014-02-11 22:33:27 +02:00
cc4cc8e5b8 Merge pull request #3990 from 1uptalent/3989-fix-textmate-syntax
Fix textmate syntax bundler organization
Upstream-commit: 029a045ef5ead0cf12f8eb62b5208456d21f70b2
Component: engine
2014-02-11 13:16:26 -07:00
750f4cb5c2 Merge pull request #4059 from alexlarsson/no-netadmin-caps
lxc: Drop NET_ADMIN capability in non-privileged containers
Upstream-commit: 3c215ba41005f225a07ebc8806216acdb746c671
Component: engine
2014-02-11 14:20:34 -05:00
c19931ad4a Avoid extra mount/unmount during container registration
Runtime.Register() called driver.Get()/Put() in order to read back the
basefs of the container. However, this is not needed, as the basefs
is read during container.Mount() anyway, and basefs is only valid
while mounted (and all current calls satisfy this).

This seems minor, but this is actually problematic, as the Get/Put
pair will create a spurious mount/unmount cycle that is not needed and
slows things down. Additionally it will create a supurious
devicemapper activate/deactivate cycle that causes races with udev as
seen in https://github.com/dotcloud/docker/issues/4036.

With this change devicemapper is now race-free, and container startup
is slightly faster.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 0c71015dcf788c5342bb9422a447b7f9ad12d43d
Component: engine
2014-02-11 18:02:30 +01:00
96a42d5055 lxc: Drop NET_ADMIN capability in non-privileged containers
With this capability set the container can e.g. change the ip address
of his devices to that of another container on the docker0 bridge. In
a quick test I was able to listen to a port on a different ip than the
one docker assigned me, but was not able to hijack an open port
redirection that another container had open. Maybe its possible with
some more knowledge of networking though.

Anyway, network setup is meant to be handled by docker, not the apps,
so I believe denying this is generally in the spirit of docker, and
it closes down potential security issues.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 02fddffd51da782f912e2709ea814c330269515b
Component: engine
2014-02-11 11:17:34 +01:00
abb4de8546 devmapper: Remove directory when removing devicemapper device
We're currently leaving around lots of empty directories in
/var/lib/docker/devicemapper/mnt/ for removed images and containers.
Fix this by removing the directory when the device is removed.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 2343fe44533f19ebae5e6127f4a2a19d1d8773fa
Component: engine
2014-02-11 09:40:13 +01:00
11beb9de93 point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: c4b9e1c9add2ab3c97cc89c8f6b12b83750cea1d
Component: engine
2014-02-11 13:16:54 +10:00
7dcdfb0d44 fix --run in docker commit
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5d29749e9dba4d918fc5ed5d6049f397e98967cf
Component: engine
2014-02-10 23:52:15 +00:00
22eab6c016 Merge pull request #4019 from ostezer/fix-installation-windows-doc-title
docs: Installation Instruction Title & Description Fixes
Upstream-commit: 2975ba6f7315bc4f1e41f6523ab927572d3aafd0
Component: engine
2014-02-10 15:26:32 -08:00
3665663666 Merge pull request #3524 from tianon/supplementary-groups
Add supplementary groups lookup in sysinit
Upstream-commit: 2dcb48af0fa9bba2fb47b08dd2c9747acf09ea44
Component: engine
2014-02-10 14:42:14 -08:00
79c6233460 Merge pull request #3871 from jdef/patch-1
Update lxc_template.go
Upstream-commit: 036900a63adf9621c4e0f4c162f89da2f4171453
Component: engine
2014-02-10 14:38:39 -08:00
2095048f8c docs: Installation Instruction Title & Description Fixes
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

1. All titles are listed by simple platform names apart from Windows' "Installing Docker On Windows". Changed this to "Windows" to match the rest.

2. Some articles' description (and title) information does not match the majority. Modified them to match the rest (i.e. Please note this project is currently under heavy development. It should not be used in production.)

3. Removed "Linux" from Gentoo & Ubuntu descriptions.
Upstream-commit: 10d57b648fe77fe34642d0af6c5c010ff1180c85
Component: engine
2014-02-10 23:34:56 +02:00
9a1d113883 Merge pull request #4026 from crosbymichael/fix-linking-icc
Add bidirectional iptables rule back to links
Upstream-commit: 63f0bbaf14a8e665409cfdb38e77d5bf77709298
Component: engine
2014-02-10 13:13:28 -08:00
1f10c0734d Merge pull request #3983 from creack/remove_linux_specific
Remove linux specific calls
Upstream-commit: 19e01a63630737b43dd13cc3cac57b158ff25de1
Component: engine
2014-02-10 12:10:38 -08:00
2b129f1c41 Merge pull request #4042 from crosbymichael/allow-empty-cmd
Improve no command handling
Upstream-commit: b42e669a190db43c9d9aa7a01153197bf9a1c9ab
Component: engine
2014-02-10 11:53:14 -08:00
4ce6d81f0d Improve no command handling
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 44821158409d59024173336188e087c605e1da1a
Component: engine
2014-02-10 11:04:24 -08:00
fecffaa7b6 Merge pull request #4017 from alexlarsson/skip_block_zeroing
devmapper: Enable skip_block_zeroing
Upstream-commit: 66f639e8a6d299789426ca21bd427722e8ccbd92
Component: engine
2014-02-10 10:33:37 -08:00
3390e64221 Merge pull request #4031 from tianon/gopath
Add slightly better GOPATH detection/handling
Upstream-commit: 6174bad135666339cc261d10fce092d64d62089b
Component: engine
2014-02-10 13:06:41 -05:00
aa80369d9a Add slightly better GOPATH detection/handling
This also adds a new "AUTO_GOPATH" environment variable that will create an appropriate GOPATH as part of the build process.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d3d85d38fb5bdd0327fdc9fe8b637cb0f4e1dcf2
Component: engine
2014-02-09 18:21:01 -07:00
de9b1efd2f Remove linux specific calls
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 3dfc910d7774d57c533b067fbe59d6b24dd803cd
Component: engine
2014-02-09 04:23:57 -08:00
64b4ce5805 Add bidirectional iptables rule back to links
Fixes #4014
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0cba91e26447e14260f111bef6d3745d2dd55444
Component: engine
2014-02-09 01:43:46 -08:00
81f4bd236b devmapper: Enable skip_block_zeroing
This makes the device mapper not zero out blocks allocated on the
thinp device. This is safe in our use case, as we access the device
via a filesystem that doesn't leak any uninitialized data to userspace.

This partially helps with https://github.com/dotcloud/docker/issues/3280
and should generally improve preformance on the devicemapper backend.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 695719b29a6311a56faae0c6ed3c985b7a75add0
Component: engine
2014-02-09 07:29:28 +01:00
29b4f1c123 Remove panic in lxc driver.
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 7c06d5e34e2ebf5006ce3a34438f18c071153e97
Component: engine
2014-02-07 19:09:52 -08:00
60784e353c Merge pull request #3987 from SvenDowideit/warn-against-symlinks
please, for the love of Docker, do. not. use. symlinks
Upstream-commit: 8228e50581faadfb1626fa18b50cc7a6309d6b43
Component: engine
2014-02-07 18:48:19 -08:00
1d05c3f324 Merge pull request #3932 from SvenDowideit/no-docker-meeting-channel
remove mention of #docker-meeting
Upstream-commit: 105188be2e321bb462edccfdddbeda2a12a74bc9
Component: engine
2014-02-07 16:28:10 -08:00
a58e2667ed Merge pull request #3978 from philips/add-philips-as-pkg-systemd-maintainer
pkg: systemd: add initial MAINTAINERS
Upstream-commit: 36aafeb0b49b096df6967b7681a7676b36abbc3b
Component: engine
2014-02-07 12:32:21 -05:00
9e9837fce8 please, for the love of Docker, do. not. use. symlinks
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: f787bec4a6853b46b1ba755d4f8a2ee07d9cbd3e
Component: engine
2014-02-07 20:20:41 +10:00
1097b506cc Instructions for Textmate's bundle installation
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
Upstream-commit: ac06646b1fb7172937c52d5f1217dcac5a86f0f9
Component: engine
2014-02-07 09:30:11 +01:00
4f66485afb New folder structure to support TextMate2 bundles format
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
Upstream-commit: f289b3a19e03b99a6618009320abaec2c0cf1ec1
Component: engine
2014-02-07 09:29:14 +01:00
f006ee4708 Added Security FAQ security
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 55b74bfe469115f25a52c6ad48b13eb9c7e6197c
Component: engine
2014-02-07 01:42:11 +01:00
e7b56195a8 Merge pull request #3948 from alexlarsson/devmapper-unmount
Devmapper cleanup and unmount fix
Upstream-commit: d0fc598ce2d4d4d4d2cc6b530ffaf74978d6d0d9
Component: engine
2014-02-06 15:10:06 -08:00
3959ecf0a9 devmapper: Fix MountDevice for non-existing Device
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 693d3f8c6ab4c9fed5fe4c5ac5fcb44568fe1638
Component: engine
2014-02-06 23:08:17 +01:00
4c4ba56ea4 devmapper: Fix UnmountDevice for non-existing device
Properly error out if passed an id that doesn't exist.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 304e33a2fe2d006cc1063c8060c6e22c9ade3d59
Component: engine
2014-02-06 22:26:09 +01:00
e004860fa8 Merge pull request #3966 from asbjornenge/updated_tmlang
Update TextMate & Sublime Text Syntaxt Highlighting with ONBUILD
Upstream-commit: 84285f7539f5825db62df3e3995d3de7b96b0a89
Component: engine
2014-02-06 14:20:52 -07:00
bd43778b40 Merge pull request #3977 from tianon/vim-onbuild
Add "ONBUILD" highlighting to our vim syntax file
Upstream-commit: 1c6f909d329c913c5f10173feeb8b618f2c2be19
Component: engine
2014-02-06 14:20:09 -07:00
bd67bce023 pkg: systemd: add initial MAINTAINERS
I volunteered for pkg/systemd MAINTAINER and there were no objections
during the #docker-dev meeting. For context I wrote most of the stuff in
here and wrote the dependent calls in api.go. Plus, I actively test the
code via CoreOS.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 15711ed670e8ab59611030ea1191189ad495ea63
Component: engine
2014-02-06 12:04:35 -08:00
20c26b1bdf docker-ci: Add new docker coverage report
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com> (github: mzdaniel)
Upstream-commit: 25d87553f678e247b3036db7804599624191dfd1
Component: engine
2014-02-06 11:59:29 -08:00
b27e52cf64 Added support for single quoted strings
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: f6c6f303f84773987afd5f83d9c1e2170fa140e3
Component: engine
2014-02-06 20:50:36 +01:00
f652ab5b5e Improved regex
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 888e8da2832871b10f60ba9d3058fc442812ca17
Component: engine
2014-02-06 20:48:15 +01:00
169c246340 Updated readme
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 3d86f07f8776fd97f1f75e99ad535a9b6543059a
Component: engine
2014-02-06 20:38:25 +01:00
94f2865699 Added suppport for the ONBUILD instruction
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: 647db3938d27d832d09f622b304c7bd23bc00d74
Component: engine
2014-02-06 20:38:20 +01:00
a0b0e2b023 Removed the YAML file since I wasn't using it
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: e95bb0b4a9ef642d02f5549ba8375f9952eff0b3
Component: engine
2014-02-06 20:37:49 +01:00