17209 Commits

Author SHA1 Message Date
moxiegirl
942363d3ca Merge pull request #15701 from moxiegirl/819-publish-cherrypicks
819 publish cherrypicks
2015-08-19 13:41:37 -07:00
Tonis Tiigi
44f2104028 Update volumes userguide
Fixes #15644

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit cc2aab7816)
2015-08-19 10:07:50 -07:00
Philipp Wahala
6117b05e87 Small fix in dev env docs
Signed-off-by: Philipp Wahala <philipp.wahala@gmail.com>
(cherry picked from commit fbc0ea32e8)

Conflicts:
	docs/project/set-up-dev-env.md
2015-08-19 10:07:39 -07:00
Qiang Huang
7d7ef1188b Add format description in run doc
And only set false to --oom-kill-disable, we just need the default
value to show.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
(cherry picked from commit 2a468ed7e4)
2015-08-19 10:06:47 -07:00
Morgan Bauer
c6d31c934b remove references to 'source repository'
- rewrite intro to Dockerfile reference usage section to remove
   references to 'source repository'
- Closes #14714
- Fixes:  #8648
- Updating with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit b143c05d64)
2015-08-19 10:06:38 -07:00
Sebastiaan van Stijn
8df037b7ca docs: fix anchor link on Ubuntu installation page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5dd28c1f9d)
2015-08-19 10:06:33 -07:00
Mary Anthony
72b8e7e3ac Updating hashcode links to commands
Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 85c2c77188)
2015-08-19 10:06:27 -07:00
Kai Blin
f9f2dbcb15 reference/run: Clarify the use of numeric UIDs
it is possible to pass an UID that has not been created inside the container, clarify this in the docs.
This should fix issue #14795

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit a7cfb098d4)

Conflicts:
	docs/reference/run.md
2015-08-19 10:06:09 -07:00
Kai Blin
3d18cd851b reference/run: Add a paragraph break
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit 4d89910820)

Conflicts:
	docs/reference/run.md
2015-08-19 10:04:24 -07:00
Kai Blin
7324d8dd8c reference/run: Add some articles
Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit 8a61e2b151)

Conflicts:
	docs/reference/run.md
2015-08-19 10:02:17 -07:00
Kai Blin
a3ae93dc2e reference/run: Some editorial changes
Based on the suggestions from @moxiegirl, some changes to make the wording more clear.

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit ba29d31c9c)

Conflicts:
	docs/reference/run.md
2015-08-19 10:00:26 -07:00
Patrick Hemmer
385676735b add documentation clarifying behavior of VOLUME instruction
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
(cherry picked from commit 08a867b82f)
2015-08-19 09:58:36 -07:00
Dharmit Shah
3e2e0397f3 Fixing docs to remove references to links under terms/
Removed terms/ directory

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
(cherry picked from commit 0a925d07a8)
2015-08-19 09:58:16 -07:00
Michael Grauer
512f486e0c Update dev machine name to default in mac installation docs
Signed-off-by: Michael Grauer <michael.grauer@kitware.com>
(cherry picked from commit f26045a534)
2015-08-19 09:58:10 -07:00
Charles Chan
745722293d Cleanup "Working with containers" page.
* Cleanup introduction
* Update output of `docker version`
* Cleanup explaination of `docker inspect`
* Change 'deleting' to 'removing' for consistency

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
(cherry picked from commit 2fcae333e8)
2015-08-19 09:58:00 -07:00
Charles Chan
87f58529b2 Reformat /containers/(id)/resize to make it consistent with "Exec Resize" section.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
(cherry picked from commit 6cd2d89469)

Conflicts:
	docs/reference/api/docker_remote_api_v1.21.md
2015-08-19 09:57:39 -07:00
Charles Chan
8f7cdbb060 Improve/fix "Dockerizing Applications" page.
* Try to update the wording for the notes.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
(cherry picked from commit 316eb2979e)
2015-08-19 09:53:09 -07:00
Morgan Bauer
172c412ae8 fix link
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
(cherry picked from commit c50e78e799)
2015-08-19 09:53:04 -07:00
Diogo Monica
67baebe9e7 Fixing race condition on private key backup how-to
Signed-off-by: Diogo Monica <diogo@docker.com>
(cherry picked from commit fbb268c12a)
2015-08-19 09:52:59 -07:00
moxiegirl
e1eee1290d Fixing bad formatting reported by David via email
Fixed and tested

Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit ef453f7118)
2015-08-19 09:52:40 -07:00
bin liu
d3fe81f9ba fix broken link to glossary page.
Signed-off-by: bin liu <liubin0329@gmail.com>
(cherry picked from commit f6753cd963)
2015-08-19 09:52:23 -07:00
Sebastiaan van Stijn
551c4559ad 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>
(cherry picked from commit 2c18e1cd05)
2015-08-19 09:52:16 -07:00
bin liu
2eaa994b24 change port number through example context
Signed-off-by: bin liu <liubin0329@gmail.com>
(cherry picked from commit b0a65f93a5)
2015-08-19 09:52:06 -07:00
moxiegirl
e9183b35a3 Merge pull request #15514 from moxiegirl/fix-installation-images
Docker Toolbox Updates fixes #14561
2015-08-11 23:39:41 -07:00
Mary Anthony
19c08cd7f4 Docker Toolbox Updates fixes #14561
- Tested Mac/iterated with Jeff on fixes
- Waiting on formal uninstall;manual now
- 4 hour work
- Fixe #14562 converting Windows to Mac
- Found errors in installer need fixes/another iteration
- Updated as far as possible with limited installation
- 3 Hours work
- Entering comments from PR review
- New screen captures and migration material
- Entering Sven's comment
- Testing with powershell, Seb's comments
- Fix link in upgrade
- Minor tweaks to http and typos
- Adding deprecation note

Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 6ca22add18)

Conflicts:
	docs/installation/mac.md
	docs/installation/windows.md
2015-08-11 23:31:06 -07:00
moxiegirl
e6d84bddc4 Merge pull request #15513 from moxiegirl/pull-link-fixes
Fixes after release
2015-08-11 23:18:56 -07:00
Mary Anthony
f5ab4142be Fixes after release
Adding in a link about the deprecated material
Fixing bad link to staging

Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 8b09f8a302)
2015-08-11 23:16:16 -07:00
moxiegirl
7d71532829 Merge pull request #15499 from moxiegirl/fix-hub-cp
Removal of docker-hub
2015-08-11 15:23:51 -07:00
Sven Dowideit
da5014009c Removing Hub v1 documentation, Hub v2 documentation will come from that repository
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 70092b3ee0)
2015-08-11 15:21:37 -07:00
Sven Dowideit
3a2e6b3871 remove unused images
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 9f530aba7f)
2015-08-11 15:21:25 -07:00
moxiegirl
e041a26365 Merge pull request #15490 from moxiegirl/cp-logging-change
Several fixes in formatting
2015-08-11 11:58:58 -07:00
Mary Anthony
b7960c1e45 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>
(cherry picked from commit 70aa63b92a)
2015-08-11 11:57:54 -07:00
David Calavera
0d03096b65 Bump version to 1.8.0
Signed-off-by: David Calavera <david.calavera@gmail.com>
v1.8.0
2015-08-11 11:35:27 -05:00
Jessica Frazelle
55e9551aaa minor cosmetic change to client output on pull
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
(cherry picked from commit 8bd6322760)
2015-08-11 11:35:27 -05:00
Mary Anthony
c65afe6ba8 Updating new vm and with migrate
Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit e5c160e1d6)
2015-08-11 11:35:27 -05:00
Mary Anthony
5745aaed22 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>
(cherry picked from commit d550d729e1)
2015-08-11 11:35:27 -05:00
Diogo Monica
b6f0f93c94 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>
(cherry picked from commit 753bf40f15)
2015-08-11 11:35:26 -05:00
Youcef YEKHLEF
33b16fef43 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>
(cherry picked from commit 35aebdc803)
2015-08-10 12:11:42 -05:00
Youcef YEKHLEF
9705c349c5 Add fedora 22 install docs warning about systemd-network
Following @cles commit #6bd15a68c for Arch

Signed-off-by: yyekhlef <yyekhlef@gmail.com>
(cherry picked from commit f224a9f3d6)
2015-08-10 12:11:42 -05:00
Ankush Agarwal
3de34af5d1 Remove note from docker version 1.3 on Env variables
Fixes #14734

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
(cherry picked from commit 89ec5399af)
2015-08-10 12:11:42 -05:00
Ankush Agarwal
b3f3abfc94 Make official install instructions use curl instead of wget
YOU GO CURL

Fixes #14650

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
(cherry picked from commit c76fef1791)
2015-08-10 12:10:42 -05:00
Mary Anthony
783baec49c Fixes #15349 too many apis
Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 1d5f479e01)
2015-08-10 12:10:42 -05:00
Vincent Bernat
c1d9e7c6fb 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>
(cherry picked from commit 56b33e9f27)
2015-08-10 12:10:42 -05:00
Derek McGowan
83f6dbe30a Skip notary tests which update system clock
Currently some notary tests change the system clock to check for expiration.
Skip these tests until the code can be refactored to not rely on updating the system clock.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit bf3c1e6a3a)
2015-08-07 10:08:37 -07:00
Jessica Frazelle
a97b89b585 remove docker-unconfined profile we were not using it and it breaks apparmor on wheezy
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
(cherry picked from commit e542238f2a)
2015-08-06 20:08:25 -07:00
Tibor Vass
29ea36a880 registry: Do not push to mirrors
This patch splits LookupEndpoints into LookupPullEndpoints and
LookupPushEndpoints so that mirrors added with --registry-mirror are
skipped in the list returned by LookupPushEndpoints.

Fixes https://github.com/docker/distribution/issues/823

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit b899977ee2)
2015-08-06 19:55:06 -07:00
Alessandro Boch
ed672d1609 Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit e35a5ae463)
2015-08-06 19:55:05 -07:00
Jessica Frazelle
5916664220 revert apparmor changes back to how it was in 1.7.1, but keep tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
(cherry picked from commit ed248207d7)
2015-08-06 19:55:05 -07:00
Lei
da4b336233 Remove redundant ip_forward check
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 6a0050d0f0)
2015-08-06 09:55:02 -07:00
Josh Hawn
74df05ccaa [graph] Use a pipe for downloads to write progress
The process of pulling an image spawns a new goroutine for each layer in the
image manifest. If any of these downloads fail we would stop everything and
return the error, even though other goroutines would still be running and
writing output through a progress reader which is attached to an http response
writer. Since the request handler had already returned from the first error,
the http server panics when one of these download goroutines makes a write to
the response writer buffer.

This patch prevents this crash in the daemon http server by waiting for all of
the download goroutines to complete, even if one of them fails. Only then does
it return, terminating the request handler.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

(cherry picked from commit d80c4244d3)
2015-08-06 09:14:16 -07:00