centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 14:25:46 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,894 Commits 57 Branches 28 Tags
b372c19b389340962ea86e598df1faea694a4aa6
Commit Graph

7894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Alexander Larsson
24f9187a04 beam: Add simple framing system for UnixConn 
This is needed for Send/Recieve to correctly handle borders between
the messages.

The framing uses a single 32bit uint32 length for each frame, of which
the high bit is used to indicate whether the message contains a file
descriptor or not. This is enough to separate out each message sent
and to decide to which message each file descriptors belongs, even
though multiple Sends may be coalesced into a single read, and/or one
Send can be split into multiple writes.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-05-01 11:06:01 -07:00
Guillaume J. Charmes
c42db412b6 Merge pull request #5092 from LK4D4/timestamp_for_docker_logs_#1165 
Timestamps for docker logs.
 2014-05-01 10:32:34 -07:00
Alexandr Morozov
d1297feef8 Timestamps for docker logs. 
Fixes #1165
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-01 20:40:36 +04:00
O.S.Tezer
f87a97f7df Improve code/comment/output markings & display consistency 
This PR aims to increase the consistency across the docs for
code blocks and code/comment/output markings.

Rule followed here is "what's visible on the screen should be reflected"

Issue:

 - Docs had various code blocks showing: comments, commands & outputs.
 - All three of these items were inconsistently marked.

Some examples as to how this PR aims to introduce improvements:

1. Removed `> ` from in front of the "outputs". Eg,
`    > REPOSITORY                 TAG       ID              CREATED` replaced with:
`    REPOSITORY                 TAG       ID              CREATED`.

2. Introduced `$` for commands. Eg,
`    sudo chkconfig docker on` replaced with:
`    $ sudo chkconfig docker on`

3. Comments:
`    > # ` replaced with:
`    # `.

> Please note:
> Due to a vast amount of items reviewed and changed for this PR, there
> might be some individually incorrect replacements OR patterns of incorrect
> replacements. This PR needs to be reviewed and if there is anything missing,
> it should be improved or amended.

Closes:
https://github.com/dotcloud/docker/issues/5286

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
 2014-05-01 17:52:01 +03:00
O.S. Tezer
51a39563fa Merge pull request #5519 from SvenDowideit/remove-rst-docs 
remove rst/sphinx documentation
 2014-05-01 16:33:54 +03:00
O.S. Tezer
c52bb90d03 Merge pull request #5516 from SvenDowideit/docs-meta-rendering 
add page_description and page_keywords md meta to mkdocs html template
 2014-05-01 16:16:48 +03:00
Sven Dowideit
adf04681b4 remove rst/sphinx documentation 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-05-01 15:31:58 +10:00
Sven Dowideit
8ae53ef167 add page_description and page_keywords md meta to mkdocs html template 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-05-01 12:41:57 +10:00
Victor Vieux
9da75eb4df Merge pull request #5514 from vbatts/vbatts-save_typo 
docker save: typo reference image, not container
 2014-04-30 19:00:22 -07:00
Michael Crosby
d0bee79394 Remove container.json from readme 
No need to duplicate this information when we already have a
container.json file in the root of libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 18:52:15 -07:00
Vincent Batts
93f8e277de docker save: typo reference image, not container 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-04-30 21:51:03 -04:00
Michael Crosby
da0d6dbd7b Make native driver use Exec func with different CreateCommand 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 18:49:24 -07:00
Michael Crosby
aa9705f832 Fix execin with environment and Enabled support 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 18:24:47 -07:00
Michael Crosby
60e4276f5a Integrate new structure into docker's native driver 
This duplicates some of the Exec code but I think it it worth it because
the native driver is more straight forward and does not have the
complexity have handling the type issues for now.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 18:20:01 -07:00
Michael Crosby
176c49d7a9 Remove command factory and NsInit interface from libcontainer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 17:55:15 -07:00
Michael Crosby
b6b0dfdba7 Export more functions from libcontainer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 17:18:07 -07:00
Michael Crosby
aecb9c39ab Split term files to make it easier to manage 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 17:04:24 -07:00
Michael Crosby
a3e96abb5a Export syncpipe fields 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 17:02:45 -07:00
Guillaume J. Charmes
26ac05c8bc Merge pull request #5511 from crosbymichael/refactor-libcontainer 
Refactor: remove statewriter type and all callback for process start
 2014-04-30 16:50:57 -07:00
Guillaume J. Charmes
be013c7820 Merge pull request #5512 from crosbymichael/set-freezer 
Add ability to set cgroups freezer
 2014-04-30 16:50:01 -07:00
Michael Crosby
5f6fda8cfd Add ability to set cgroups freezer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 16:07:12 -07:00
Michael Crosby
f110401437 Remove statewriter interface, export more libcontainer funcs 
This temp. expands the Exec method's signature but adds a more robust
way to know when the container's process is actually released and begins
to run.  The network interfaces are not guaranteed to be up yet but this
provides a more accurate view with a single callback at this time.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 15:52:40 -07:00
Michael Crosby
cd8cec854b Export SetupUser 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 15:27:59 -07:00
Michael Crosby
162dafbcd5 Remove logger from nsinit struct 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 15:24:18 -07:00
Michael Crosby
bfedf247a4 Merge pull request #5498 from tianon/better-apparmor-missing-error 2014-04-30 15:16:43 -07:00
Guillaume J. Charmes
2a711d16e0 Merge pull request #5448 from crosbymichael/selinux-defaults 
Add selinux label support for processes and mount
 2014-04-30 14:14:39 -07:00
Michael Crosby
2fc5bed61d Merge pull request #5506 from crosbymichael/add-system-maintainer 
Add system maintainers
 2014-04-30 14:14:21 -07:00
Tibor Vass
986c647d5a Fix bridge ip comparison 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-04-30 12:36:16 -07:00
Michael Crosby
e88ef454b7 Merge pull request #5464 from tianon/close-leftover-fds 2014-04-30 12:27:52 -07:00
Michael Crosby
6203d8b462 Add system maintainers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-04-30 12:01:06 -07:00