1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Guillaume J. Charmes
a7ccbfd5f1 Month devpts before mounting subdirs
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-05-02 13:55:45 -07:00
Solomon Hykes
954e5334f0 Basic forward backend 2014-05-02 12:52:44 -07:00
Victor Vieux
45be6f6dff fix https
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-02 19:49:12 +00:00
Gabriel Monroy
9f152aacf8 deregister containers before removing driver and containerGraph references
This is required to address a race condition described in #5553,
where a container can be partially deleted -- for example, the
root filesystem but not the init filesystem -- which makes
it impossible to delete the container without re-adding the
missing filesystems manually.

This behavior has been witnessed when rebooting boxes that
are configured to remove containers on shutdown in parallel
with stopping the Docker daemon.

Docker-DCO-1.1-Signed-off-by: Gabriel Monroy <gabriel@opdemand.com> (github: gabrtv)
2014-05-02 13:27:17 -06:00
Michael Crosby
4d521f479b Merge pull request #5507 from shykes/dind-maintainer
Make Jerome Petazzoni a maintainer for dind
2014-05-02 11:25:41 -07:00
Michael Crosby
59fe77bfa6 Don't restrict lxc because of apparmor
We don't have the flexibility to do extra things with lxc because it is
a black box and most fo the magic happens before we get a chance to
interact with it in dockerinit.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-02 11:14:24 -07:00
Guillaume J. Charmes
1c5a3123cc Merge pull request #5529 from crosbymichael/restrict-proc
Mount /proc and /sys read-only, except in privileged containers
2014-05-02 10:52:53 -07:00
Victor Vieux
8c9192cd76 move hijack to it's own file
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-02 17:45:58 +00:00
Jef Mathiot
5878fe3834 Add the ability to configure the project name 2014-05-02 18:00:58 +02:00
Felix Rabe
877ad96d89 cli.md: Fix up Markdown formatting by adding one ` 2014-05-02 16:53:59 +02:00
Solomon Hykes
b372c19b38 Merge pull request #5501 from discordianfish/add-commit-message-bp 2014-05-01 23:47:31 -07:00
Solomon Hykes
f4b60a385c Merge pull request #5536 from vmarmol/add-maintainers-libcontainer 2014-05-01 23:42:50 -07:00
Solomon Hykes
3aed457ac5 Freeze dependencies with godep 2014-05-01 23:39:13 -07:00
Solomon Hykes
6a6596913a First skeleton of a simulator 2014-05-01 23:31:06 -07:00
Solomon Hykes
a1b63f4b79 Pass standard streams through between frontend and backend 2014-05-01 23:30:34 -07:00
Michael Crosby
76fa7d588a Apply apparmor before restrictions
There is not need for the remount hack, we use aa_change_onexec so the
apparmor profile is not applied until we exec the users app.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-01 19:09:12 -07:00
Solomon Hykes
9acaf7597f Backends can receive arguments 2014-05-01 18:32:06 -07:00
Solomon Hykes
c22a80a071 Choose a single backend with --backend
Note: for now there is only one backend available, `debug`
2014-05-01 18:13:55 -07:00
James Turnbull
b263495f6a Merge pull request #5541 from SvenDowideit/docs-generate-all-api-docs
Force the older API docs to be generated.
2014-05-01 20:58:12 -04:00
Sven Dowideit
41db175626 Force the older API docs to be generated.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-05-02 10:46:41 +10:00
Solomon Hykes
142e43a447 Use codegansta/cli for argument parsing 2014-05-01 17:27:17 -07:00
Solomon Hykes
cb213c5a68 Better error messages 2014-05-01 17:26:46 -07:00
Solomon Hykes
4bdc2407b6 Sleep 1 full second at startup to workaround a race condition in api/server 2014-05-01 17:25:17 -07:00
Victor Vieux
314bd02d2c remove when httputil.NewClientConn when not in hijack
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-02 00:25:10 +00:00
Sven Dowideit
148e081ded Merge pull request #5521 from SvenDowideit/doc-auto-section
make sure the intermediate index.html files are generated consistently
2014-05-02 10:13:18 +10:00
Sven Dowideit
5a8ffe7ef1 make sure the intermediate index.html files are generated consistently
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-05-02 10:08:25 +10:00
O.S. Tezer
ccbc4f24d6 Merge pull request #5517 from SvenDowideit/5267-make-archived-docs-hidden-but-linkable
Bring back archived remote API versions
2014-05-02 02:56:03 +03:00
Sven Dowideit
de49e7c0a6 Bring back archived remote API versions
- git mv archived/* .
- put the links back into the summary document
- reduce the header depth by 1 so the TOC lists each API version
- update the mkdocs.yaml to render the archived API docs, but not add
  them to the menu/nav

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-05-02 09:47:33 +10:00
James Turnbull
edab1bd5e5 Merge pull request #5524 from ostezer/docs-fix-codeblocks
Improve code/comment/output markings & display consistency
2014-05-01 19:39:06 -04:00
Solomon Hykes
29df891a2d Add .gitignore 2014-05-01 16:29:39 -07:00
Solomon Hykes
cd9abab36a Move call logger to a separate backend (more backends to come) 2014-05-01 16:29:16 -07:00
Solomon Hykes
ca7c1fbf49 Add basic README 2014-05-01 16:21:14 -07:00
Solomon Hykes
f132e3fb03 Initial commit 2014-05-01 16:13:41 -07:00
Victor Marmol
71e3757174 Adding Rohit Jnagal and Victor Marmol to pkg/libcontainer maintainers.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
2014-05-01 15:51:38 -07:00
Victor Marmol
91b5fe8502 Adding Rohit Jnagal and Victor Marmol to pkg/cgroups maintainers.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
2014-05-01 15:48:16 -07:00
Michael Crosby
24e0df8136 Fix /proc/kcore mount of /dev/null
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-01 15:26:58 -07:00
Michael Crosby
3f74bdd93f Mount attr and task as rw for selinux support
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-01 15:26:58 -07:00
Michael Crosby
f5139233b9 Update restrictions for better handling of mounts
This also cleans up some of the left over restriction paths code from
before.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-01 15:26:58 -07:00
Michael Crosby
83982e8b1d Update to enable cross compile
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-01 15:26:58 -07:00
Jérôme Petazzoni
1c4202a614 Mount /proc and /sys read-only, except in privileged containers.
It has been pointed out that some files in /proc and /sys can be used
to break out of containers. However, if those filesystems are mounted
read-only, most of the known exploits are mitigated, since they rely
on writing some file in those filesystems.

This does not replace security modules (like SELinux or AppArmor), it
is just another layer of security. Likewise, it doesn't mean that the
other mitigations (shadowing parts of /proc or /sys with bind mounts)
are useless. Those measures are still useful. As such, the shadowing
of /proc/kcore is still enabled with both LXC and native drivers.

Special care has to be taken with /proc/1/attr, which still needs to
be mounted read-write in order to enable the AppArmor profile. It is
bind-mounted from a private read-write mount of procfs.

All that enforcement is done in dockerinit. The code doing the real
work is in libcontainer. The init function for the LXC driver calls
the function from libcontainer to avoid code duplication.

Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
2014-05-01 15:26:58 -07:00
Michael Crosby
559dc9a66a Merge pull request #5534 from vieux/fix_apparmor_inside_container
Fix apparmor inside container
2014-05-01 15:25:40 -07:00
Victor Vieux
de191e8632 skip apparmor with dind
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-01 22:22:08 +00:00
Victor Vieux
ae686c0486 Revert "add apparmor to the Dockerfile"
This reverts commit fa1e390cad.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-01 21:49:53 +00:00
Tianon Gravi
8296125b32 Merge pull request #5532 from vieux/add_apparmor_dockerfile
Add apparmor to the Dockerfile to fix dind issues
2014-05-01 15:00:48 -06:00
Victor Vieux
fa1e390cad add apparmor to the Dockerfile
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-01 20:51:16 +00:00
Michael Crosby
20bcb80f40 Merge pull request #5457 from tiborvass/5423-bridge-ip
Fix bridge ip comparison
2014-05-01 11:56:47 -07:00
Michael Crosby
ab0518bfe8 Merge pull request #5528 from crosbymichael/drop-capsyslog
drop CAP_SYSLOG capability
2014-05-01 11:52:08 -07:00
Eiichi Tsukata
cac0cea03f drop CAP_SYSLOG capability
Kernel capabilities for privileged syslog operations are currently splitted into
CAP_SYS_ADMIN and CAP_SYSLOG since the following commit:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ce6ada35bdf710d16582cc4869c26722547e6f11

This patch drops CAP_SYSLOG to prevent containers from messing with
host's syslog (e.g. `dmesg -c` clears up host's printk ring buffer).

Closes #5491

Docker-DCO-1.1-Signed-off-by: Eiichi Tsukata <devel@etsukata.com> (github: Etsukata)
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-01 11:43:55 -07:00
Guillaume J. Charmes
fe4a25546a Merge pull request #5515 from crosbymichael/refactor-libcontainer2
Remove CommandFactory and NsInit interface
2014-05-01 11:41:54 -07:00
Solomon Hykes
10a50fcd8f Merge pull request #5526 from shykes/pr_out_beam_add_simple_framing_system_for_unixconn 2014-05-01 11:06:14 -07:00