Commit Graph

3981 Commits

Author SHA1 Message Date
63ab074ee2 Merge pull request #15237 from charleswhchan/patch-3
Reformat /containers/(id)/resize to make it consistent with other sections.
Upstream-commit: bba762b19254b8315aa8d5a6a63cb00253eaa42c
Component: engine
2015-08-16 10:59:16 +02:00
5ba2c88bd5 Reformat /containers/(id)/resize to make it consistent with "Exec Resize" section.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 6cd2d8946902eddab5e3902efeef3c7ffd748a1e
Component: engine
2015-08-15 19:47:01 -07:00
f2f5327a6e Merge pull request #14113 from dit4c/10348-exec-privileged
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
2015-08-16 00:20:41 +02:00
6d118e9c38 Merge pull request #15428 from charleswhchan/patch-1
Improve/fix "Dockerizing Applications" page.
Upstream-commit: aedd45346a19f9d06ebeec9ca7117a104e0c23c1
Component: engine
2015-08-14 14:03:11 -07:00
b867f2e185 Merge pull request #15542 from MHBauer/rundoclink
fix link
Upstream-commit: d1585f1d6610c36d3d0ba93421ed605d9fd9931d
Component: engine
2015-08-14 20:35:51 +02:00
6c82403d31 Merge pull request #15574 from diogomonica/fixing-race-on-key-backup
Fixing race condition on private key backup how-to
Upstream-commit: 424702b91ac31a5caaad0a2c97693db87170d40f
Component: engine
2015-08-14 11:26:56 -07:00
2ad32c4a2a Correct readability of --userland-proxy para
Was reading this to explain it to someone and noticed the missing "s"
which makes it not so great for nice English readability..

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 4e53e80934f1813ff3e66d69fc931ed59707ffc6
Component: engine
2015-08-13 23:56:42 -04:00
f65a61ad5d Fixing race condition on private key backup how-to
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: fbb268c12ab12fa282f11eabdedf7fdee3d24b4a
Component: engine
2015-08-13 19:16:00 -07:00
f1cc5568e9 Merge pull request #13501 from vdemeester/8048-image-repository-tag
Fix #8048 : make `docker images repository:tag` work
Upstream-commit: c6c195a465652e96b06e76b44a1df075cba9ad80
Component: engine
2015-08-13 21:36:21 +02:00
6c6e94b0e5 Merge pull request #15560 from docker/patch-bad-formatting
Fixing bad formatting reported by David via email
Upstream-commit: 599b76000d64cd4771410513812fe3560467f82b
Component: engine
2015-08-13 20:26:05 +02:00
2a1429c0c6 Merge pull request #15451 from liubin/liubin/fix-broken-link
fix broken link to wiki
Upstream-commit: 6b1b1ad31cc0b0433ec33743488b40d8f1919894
Component: engine
2015-08-13 17:03:41 +02:00
a65c38b101 fix broken link to glossary page.
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: f6753cd9635b294f1463ef7fb6952dd2a74c0a69
Component: engine
2015-08-13 22:40:20 +08:00
13929d0935 Fixing bad formatting reported by David via email
Fixed and tested

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ef453f7118d704319768d8d9c0cfe79e2d521afa
Component: engine
2015-08-13 06:42:26 -07:00
155dc9b901 Docs: some fix about notarysandbox
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 79aac6584de8c5cd1797933f20b6d9b1c2fa33e9
Component: engine
2015-08-13 16:53:05 +08:00
d024131050 Fix #8048 : make docker images repository:tag work
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.

Closes #8048.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4fb88d2e11f2f16c520b36e4c6e00db44ae26b8c
Component: engine
2015-08-13 08:50:09 +02:00
273be038ad Updated test to check for exec --privileged side-effects
Also improving documentation for same feature as part of
docker/docker#14113 docs review.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: 90326939c8089dbd7b59423415bc67cae6208b08
Component: engine
2015-08-13 16:37:20 +10:00
337be087f4 Revert "Revert "Add docker exec run a command in privileged mode""
This reverts commit 40b71adee390e9c06471b89ed845132b4ec80177.

Original commit (for which this is effectively a rebased version) is
72a500e9e5929b038816d8bd18d462a19e571c99 and was provided by Lei Jitang
<leijitang@huawei.com>.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: 03f65b3d0d66ccdc8b69a447b75508d594007600
Component: engine
2015-08-13 16:36:44 +10:00
2c3fdeb15a Merge pull request #15541 from thaJeztah/hashtag-space
docs: fix fedora prerequisites heading
Upstream-commit: 650feb29f10bc2775877579c67534646949610f2
Component: engine
2015-08-12 19:33:38 -07:00
363f39db73 fix link
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: c50e78e799a3e66306d6376c60337d38de1bd59a
Component: engine
2015-08-12 17:20:20 -07:00
534bcd14d8 Merge pull request #15449 from albers/completion-help
Remove -h flag from completion and daemon reference
Upstream-commit: d50881e446c4f230099e41124fda481849e82222
Component: engine
2015-08-12 17:09:51 -07:00
8998990826 docs: fix fedora prerequisites heading
Fixes the prerequisites heading not being
rendered properly, because of a missing space.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2c18e1cd053895cd1ef28ec940d4be7f94c97604
Component: engine
2015-08-13 01:29:10 +02:00
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
f68b6c3486 Remove -h flag from completion and daemon reference
All docker subcommands support `-h` as an alias for `--help`
unless they have `-h` aliased to something else like `docker run`,
which uses `-h` for `--hostname`.

`-h` is not included in the help messages of the commands, though.

It ist visible in
* reference: only in `docker daemon` reference,
  see output of `grep -Rse --help=false docs`
* man pages: only in `docker` man page
  see output of `grep -RF '**-h**' man`

For consistency reasons, this commit removes `-h` as an alias for
`--help` from the reference page, man page and the bash completion.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ceb11d966034f4b4308abf4fc2826b4c840b6e99
Component: engine
2015-08-11 07:30:58 -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
81359ed9eb Improve/fix "Dockerizing Applications" page.
* Try to update the wording for the notes.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 316eb2979eb04d2d9524d6856b8e415c33c460f0
Component: engine
2015-08-08 16:13:23 -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