Commit Graph

3958 Commits

Author SHA1 Message Date
8aaf7ef170 Merge pull request #15450 from liubin/liubin/change-port-number-through-example
change port number through example context
Upstream-commit: 8a0efadee14769f39abb0b3c67a2c794dc973443
Component: engine
2015-08-12 09:49:50 -07:00
a3fa37d61e Fixes after release
Adding in a link about the deprecated material
Fixing bad link to staging

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8b09f8a302eaf7d73015112a774010e57e7f2c25
Component: engine
2015-08-11 23:13:14 -07:00
10cc4f16e2 Merge pull request #15458 from moxiegirl/remove-registry-v1-14616
Removing references to registry 1.0
Upstream-commit: c4cb55b84f052c1e5d88860128a1117b696af332
Component: engine
2015-08-10 17:44:32 -07:00
ad80c7d292 Initial work
Removing references to regsitry 1.0, pointing to distribution
Updating links and title
Adding in comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d550d729e14d1a18d00b66a941da5b23b9a61bd3
Component: engine
2015-08-10 17:43:41 -07:00
a2a72ddf40 Docker content trust documentation
- started from Diogo's work
- updated after discussions with team
- Updating with new key names
- fixing weight
- adding in sandbox
- adding in gliffy for images
- backing out to old names for now
- Copy edit pass
- Entering comments from the content trust team
- Update name of branch and image name
- Removing the last diogo reference
- Updating with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 753bf40f154853c32dbd46150cfd964773110610
Component: engine
2015-08-10 17:22:11 -07:00
2a0dec8002 Updating new vm and with migrate
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e5c160e1d68fa7ed485827a88a577b9fff2077c7
Component: engine
2015-08-10 13:29:08 -07:00
9d87f815bc change port number through example context
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: b0a65f93a5ab2de540825fab43b4d2ec01f22f36
Component: engine
2015-08-10 23:12:03 +08:00
8120b4d8fe Change all docker -d to docker daemon
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 81cc8ebc93c20537d5fab4c016a3774f58b3e483
Component: engine
2015-08-10 20:48:08 +08:00
ad4c7580a8 Merge pull request #15400 from vincentbernat/doc/memory-cgroup-overhead
doc: add a notice about memory accounting overhead
Upstream-commit: b173314ccad9462be10b245e116399e5dadffa7c
Component: engine
2015-08-09 16:38:41 -07:00
c72c9f1bde Merge pull request #15411 from moxiegirl/fix-links-15349
Fixes #15349 too many apis
Upstream-commit: 8e05a3e30f931726cd5f8a397e5517802cb96efb
Component: engine
2015-08-09 20:52:49 +02:00
763abc3713 Cleanup "Automatically start containers" page.
* Remove old information for Docker 1.2. (See PR #15408)

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: ad3df4995851df6df767798c39f880c6d0f7e7aa
Component: engine
2015-08-08 17:28:21 -07:00
df69d73527 Merge pull request #15312 from yyekhlef/fedora_22_doc
Fedora 22 manual network configuration and ip forwarding
Upstream-commit: 00843d18d86fe764a7384971392a8a7863bf9a30
Component: engine
2015-08-08 12:59:11 -07:00
14f3afb080 Merge pull request #15408 from ankushagarwal/env-var-docs
Make Environment replacement note less kludgy
Upstream-commit: 030df722797295826838d63df5caff5c73746428
Component: engine
2015-08-08 12:56:19 -07:00
4e2e37d904 Merge pull request #15409 from ankushagarwal/wgetcurl
Make official install instructions use curl instead of wget
Upstream-commit: 22d539866cbbffb95f1b37c96fa47086b02d3527
Component: engine
2015-08-08 12:51:48 -07:00
2c6e673ce7 typofix - https://github.com/vlajos/misspell_fixer
Signed-off-by: Veres Lajos <vlajos@gmail.com>
Upstream-commit: 514623272398574c8fd7ef3fe42c5b2ae161349a
Component: engine
2015-08-07 23:25:49 +01:00
9b317da6c1 Remove note from docker version 1.3 on Env variables
Fixes #14734

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 89ec5399aff830ed0b00ff24610969fbf9ad4fdc
Component: engine
2015-08-07 14:36:06 -07:00
7b7445d1b7 Fixes #15349 too many apis
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 1d5f479e01388e1bffcd61f9c3896093ac82d5d0
Component: engine
2015-08-07 11:37:05 -07:00
3709a03001 Make official install instructions use curl instead of wget
YOU GO CURL

Fixes #14650

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: c76fef1791106ca60b7f913a895a77251b695c0a
Component: engine
2015-08-07 10:16:09 -07:00
a3035b6b7d doc: add a notice about memory accounting overhead
The documentation for Debian and Ubuntu explains how to enable memory
and swap accounting but doesn't explain why it is disabled in the first
place. The problem with those subsystems is that they incurs a
performance hit even when not used at all. Add this explanation.

The provided figure are quite vague. The memory overhead is easily
verifiable. It is for example cited in [RedHat documentation][]. For the
performance hit, maybe the performance is better now, but a few years
ago, it was said to be [between 6 and 15%][].

The goal is that people don't just enable memory accounting if they
don't have a use for it.

[RedHat documentation]: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Resource_Management_Guide/sec-memory.html
[between 6 and 15%]: https://lwn.net/Articles/517562/

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 56b33e9f27fa9dc50cec16392ca01bd4234390f9
Component: engine
2015-08-07 14:31:33 +02:00
5024eec3d4 Merge pull request #15386 from jfrazelle/remove-docker-unconfined-profile
remove docker-unconfined profile we were not using it
Upstream-commit: b9094633f361c1881172fc38e4f91de5659f671b
Component: engine
2015-08-06 20:06:33 -07:00
e67b461c56 Merge pull request #15351 from SvenDowideit/remove-hub-v1-documentation
Removing Hub v1 documentation, Hub v2 documentation will come from th…
Upstream-commit: 818190b1fff6d77a1025d96b31fc114930fe8363
Component: engine
2015-08-07 10:33:15 +10:00
59f2aefefe remove docker-unconfined profile we were not using it and it breaks apparmor on wheezy
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: e542238f2a4ba9d77bf8ebc77e319dd6b321925f
Component: engine
2015-08-06 16:51:01 -07:00
9b8412fbbf remove unused images
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 9f530aba7f24ddd8e4003e27db6fca5c6d4cc638
Component: engine
2015-08-06 23:34:29 +00:00
8b8aa7835d Removing Hub v1 documentation, Hub v2 documentation will come from that repository
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 70092b3ee06106cddfecb1093d8612a2f3fc6b21
Component: engine
2015-08-06 23:00:49 +00:00
26a62f2497 - Remove references to sudo in basics.md; see sudo instructions top of file
- Removing references to Boot2Docker replacing with Docker Machine
- Removing sudo warnings in instances where appropriate (no sudo in file)
- Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cc375a1e48d0f4b3855e7f14b09ead244bbbadfb
Component: engine
2015-08-05 19:45:43 -07:00
ef703e5bbc Minor typo in test-and-docs.md
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b5eea8f33b20bf480bc7c496b12818483dffb96b
Component: engine
2015-08-05 13:22:39 -07:00
9416fd6ce9 Windows: Workaround for CI
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ac120567e8015a6a98f0aa7ac71f3ce2d5f36031
Component: engine
2015-08-05 11:20:30 -07:00
acc8db8b85 Merge pull request #15305 from vdemeester/contribution-docs-updates
Update some contributions documentations
Upstream-commit: 6206cbe19350d8df7199573c79c981af5fc72b1d
Component: engine
2015-08-05 08:46:53 -07:00
67cdf00aed Add fedora 22 install docs warning about systemd-network
With systemd in version 219 IP forwarding should be forced in the interface configuration file.

Signed-off-by: yyekhlef <yyekhlef@gmail.com>
Upstream-commit: 35aebdc803e2ffedf3208f0fd27a7652562fc007
Component: engine
2015-08-05 01:33:13 +02:00
ab644e28c0 Add fedora 22 install docs warning about systemd-network
Following @cles commit #6bd15a68c for Arch

Signed-off-by: yyekhlef <yyekhlef@gmail.com>
Upstream-commit: f224a9f3d609eec8bff9c6be18582eb72cd0e7ef
Component: engine
2015-08-05 01:32:33 +02:00
5f1a727f3d Merge pull request #15301 from jfrazelle/fix-systemd-docs
update systemd article to reference dropin file
Upstream-commit: d4d3504122211812401456e69cf4852365977a32
Component: engine
2015-08-04 22:12:36 +02:00
bc9b99ad99 Update some contributions documentations
- Add a golint entry to coding-style.md

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b30492002172a525513a2c411ebae22149dd4476
Component: engine
2015-08-04 22:04:11 +02:00
5df863af84 update systemd article to reference dropin file
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 35e7a7c3e2f0e7329ef666b0e5078b39626befd2
Component: engine
2015-08-04 11:03:43 -07:00
2d50f13b4a Merge pull request #15300 from l0rd/test-and-docs-fix
Removed `docs-test` from Makefile rules list
Upstream-commit: 0f491411500eeb18a6be2416fecfcd200e02db08
Component: engine
2015-08-04 19:41:48 +02:00
ce6d511a95 Removed docs-test from Makefile rules list
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
Upstream-commit: 5237670b5b9b1953a93e0f5ab83a0140ef037186
Component: engine
2015-08-04 15:57:42 +00:00
5d5181b3aa Removing deprecated notice to update mkdocs.yml in docs README
Signed-off-by: Laurent Erignoux <lerignoux@gmail.com>
Upstream-commit: ac1794d3e299cb3b69edfd4241f22501b7282320
Component: engine
2015-08-04 15:15:46 +02:00
6d8b655cbf Merge pull request #15236 from charleswhchan/patch-1
Fix #15212: Add "Label" key to output of /containers/json
Upstream-commit: bc1209425117b6e1e80b3dba0259a24ff87835dc
Component: engine
2015-08-04 21:48:39 +10:00
fcc2624be6 Break long command to avoid cropping
Fixes docker/docker#14558

Signed-off-by: Francesc Campoy <campoy@google.com>
Upstream-commit: 16b5b6e49f3ee1a327216ec9b6fe4b857f3ea7a2
Component: engine
2015-08-03 18:36:32 -07:00
e2641596d8 Fix #15212: Add "Labels" key to output of /containers/json
Applied retroactively from API v1.18 - v1.21.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: b245bcd458492c9b348b790a9422dd7478f9af83
Component: engine
2015-08-03 18:11:33 -07:00
2ed38fa3eb Merge pull request #15255 from crosbymichael/lxc-dep
Add LXC built in support deprecation notice
Upstream-commit: dfb63b042568b0f4fd42bc2710761e5897a4f133
Component: engine
2015-08-03 15:36:43 -07:00
2bffc18a77 Add LXC built in support deprecation notice
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 06f6c0c7e50ea0df588d1d873783f326c23f195a
Component: engine
2015-08-03 14:54:42 -07:00
c16ee87f87 Merge pull request #15233 from srust/add_blockbridge_volume_plugin
Docs: Add Blockbridge volume plugin
Upstream-commit: 637cf3a4b73fd5684a965c877d678387f5a7146c
Component: engine
2015-08-03 09:46:33 -07:00
5e11aab67e Merge pull request #15249 from Evalle/15198-fix-path-to-routing-menu
Fix wrong path to YaST's 'Routing' menu for openSUSE Tumbleweed
Upstream-commit: 1367bb41fc8d46891af470b444c694de81f171b5
Component: engine
2015-08-03 09:04:10 -07:00
74d2bf6a9c Merge pull request #15248 from vdemeester/userguide-fixes
Fix "Getting started" link in userguide
Upstream-commit: cc5cd65e6d67311d862b853f2ec5960f82dc3e41
Component: engine
2015-08-03 09:00:18 -07:00
255ee9aa6c Several fixes in formatting
- fixing headings in run.md
- creating a table for readability
- adding index for logging
- moving logging overview into logging
- Updating with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 70aa63b92a1aba21a0276904c9447ac7c5114f50
Component: engine
2015-08-03 08:45:25 -07:00
f0e94927fa Fix wrong path to YaST's 'Routing' menu for openSUSE Tumbleweed
Signed-off-by: evalle <shmarnev@gmail.com>
Upstream-commit: 5f1593c7b8cba267fb044156e152b7afcbcc2cd4
Component: engine
2015-08-03 12:01:25 +02:00
0ae7f92229 Fix "Getting started" link in userguide
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5d57f56362448908e518922032aac297a1f2c4db
Component: engine
2015-08-03 11:48:59 +02:00
2e4a0c6586 Docs: Add Blockbridge volume plugin
Signed-off-by: Stephen Rust <srust@blockbridge.com>
Upstream-commit: 8b15b7958a9bb1298f8d82676c1ddef47fdc054d
Component: engine
2015-08-02 21:48:46 -04:00
091a1141be Update docker_remote_api.md
Minor fixes:
* v1.19: GET /containers/(id)/logs - add missing '/'
* v1.18: Break up POST /containers/create and POST /containers/(id)/start into separate lines.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 084d46408160cf309bb7730a0ccb7fdd2f71c84e
Component: engine
2015-08-02 10:11:18 -07:00
3022ea2e8f Merge pull request #14539 from nhocki/improve-docs-for-execstart
Adding information about ExecStart configuration for systemd
Upstream-commit: 7feb176233f2cc86f249de8aa4c2e98095e8d324
Component: engine
2015-08-01 09:23:59 -07:00