Commit Graph

2766 Commits

Author SHA1 Message Date
6148a6ae03 Modify ip_forward instructions
Signed-off-by: ChristoperBiscardi <chris@docker.com>
Upstream-commit: 4ab18fa2ac119c26516f2156dabda9dd0a781301
Component: engine
2015-03-10 19:28:55 -07:00
6d6d8eee07 Fix a few code rendering errors in docs
Signed-off-by: ChristoperBiscardi <chris@docker.com>
Upstream-commit: 79a0fa29f1de0be0d69adf54a63eed7312d4be70
Component: engine
2015-03-08 16:18:43 -07:00
d5e3b94455 Cleanup: new project docs fix-ups (alternative)
This cleans up the recently added project docs and
fixes some minor issues.

- remove inline styles where possible
- add redirects for renamed/replaced documents
- add styles for GitHub labels to match the style on GitHub
- fix minor markdown issues causing some code-blocks
  to be shown as text
- wrap the documents to 80-chars
- use 4 spaces in stead of tabs for identing and remove
  trailing whitespace/redundant blank lines
- optimized 'gordon' image

NOTE:
This alternative commit/PR re-introduces some inline
styles because the docs/base image has not yet been
updated for the current docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: efc625fcd00b0f76e484d0bc081bafcfd789cfbb
Component: engine
2015-03-07 23:40:34 +01:00
f757146875 Merge pull request #11097 from thaJeztah/11069-run-reference-restart-policies
Docs: add restart-policies to 'Run reference'
Upstream-commit: faa6fd40f436587999e24b0f5c3369c007a6c482
Component: engine
2015-03-06 22:08:29 -08:00
c42f7eda7c Fixing two bad files that got borked in the last rebase
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: efde5ec9bea6ec6ea17a162a0031839b9a58392a
Component: engine
2015-03-06 14:21:17 -08:00
9eb8a0214c Rewrite the Contributing tree as Project in preparation for the Docker birthday.
Signed-off-by: Mary Anthony <mary.anthony@docker.com>

Optimize images, remove old file, add metadata tagging

Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: 8c575f263dff23bec76dd0aa169e278fe4bfcb74
Component: engine
2015-03-06 14:10:55 -08:00
eb845a4592 Merge pull request #11195 from ahmetalpbalkan/doc/remote-api-kind
doc/api: explain Kind (ChangeType)
Upstream-commit: e058b7980d6ddf09fac8ef68d806dcc26e63e264
Component: engine
2015-03-07 07:19:29 +10:00
405e3e2f5f Merge pull request #11204 from duglin/VolumeDocs
Tell users about how VOLUME initializes the new mount point/volume
Upstream-commit: 55fc7f5c9d3bb0e03e76b62c2ff0123a20d5e3c7
Component: engine
2015-03-06 10:44:03 -08:00
ed2fc0acb0 Tell users about how VOLUME initializes the new mount point/volume
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9be2ca2394112d8e988dc492f482cefd93a5b5fb
Component: engine
2015-03-06 10:25:47 -08:00
cc2fe887e1 remote api: explain Kind (ChangeType)
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 957bc8ac50ee4e2498143fca7848b4ccaab6147a
Component: engine
2015-03-05 19:39:14 -08:00
6bfc416abd docker info display http/https_proxy setting
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com>
Upstream-commit: 06a40f0f281b4679855a406bc202e122d2875949
Component: engine
2015-03-06 09:02:21 +08:00
9984f3e27c Merge pull request #11172 from duglin/5169-LinkEnvDocs
Add some text about env vars when linking containers
Upstream-commit: 0bf6015745baf0dcb7d671df3b4852a027394b2c
Component: engine
2015-03-05 12:18:04 -08:00
1f1e8e9abc Add some text about env vars when linking containers
In particular, the security implications.

Closes #5169

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3c9425d40dbb069db9fe795eddc3fccfc62164f8
Component: engine
2015-03-05 09:39:10 -08:00
aa9b58cd0b Don't test resolv.conf updater on overlay filesystem
The overlay filesystem does not support inotify at this time. The
resolv.conf updater test was passing on overlay-based Jenkins because of
a fluke--because it was DIND, /etc/resolv.conf on the "host" was really
a bind-mounted resolv.conf from the outer container, which means a watch
directly on that file worked as it was not overlay backed.  The new test
(from #10703) unmounts the bind-mounted copy to test create and modify
code-paths, which caused us to hit the issue.

This PR also adds a note to the docs about the lack of auto-update when
using the overlay storage driver.

See https://lkml.org/lkml/2012/2/28/223 for more info on inotify and
overlay.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 9057ca2541582fc41eb7cb45edd332247a813bba
Component: engine
2015-03-05 00:22:01 -05:00
62e7b16446 Docs: add restart-policies to 'Run reference'
This moves some information on restart-policies from
the "command line" page to "run reference".

Also fixes some minor typos and adds a "NOTE"
about --rm and --restart not allowed to be combined.

Also removes inline CSS styles from tables,
which will be styled by the stylesheet, and fixes
some minor MarkDown errors (`<` -> &lt;)

depends on https://github.com/docker/docs-base/pull/1

resolves #11069

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8833779ae0384f3f9a995f94e42478451107a5ed
Component: engine
2015-03-05 01:13:53 +01:00
97033cc69f Merge pull request #10586 from resouer/10532-fix-cors-hardcode
Fix 10532 to change --api-enable-cors to string.
Upstream-commit: 7b3ffd5cc0b293aac67e2c07948b2e68525b72d1
Component: engine
2015-03-04 18:42:20 +00:00
cd57675c32 Merge pull request #11134 from duglin/CheckMultiLineHelp
Fix 'docker ps --help' so the options don't span more than one line
Upstream-commit: ffc755ac14a49f41d0b27204b0a50034397c946e
Component: engine
2015-03-04 05:53:47 -08:00
36f1975bfd Merge pull request #9437 from cpuguy83/set_rlimits_in_container
Allow setting ulimits for containers
Upstream-commit: df7ba57f5f962b1a2d2e267a89ae465541a92371
Component: engine
2015-03-04 04:00:17 -08:00
6827e12a3d Merge pull request #10858 from duglin/10807-MixedcaseDockerfile
Support dockerfile and Dockerfile
Upstream-commit: beea697be365631ceeb92761e094f1ffe307ca33
Component: engine
2015-03-04 03:52:49 -08:00
570cc01da3 Merge pull request #11051 from bdehamer/add-registry-api-client-library
Add reference to docker-reg-client
Upstream-commit: 98630b2ef62653d288430b25867ddacbf1731441
Component: engine
2015-03-03 20:41:42 -08:00
bc3e4a6737 Support dockerfile and Dockerfile
Closes #10807

Adds support for `dockerfile` ONLY when `Dockerfile` can't be found.
If we're building from a Dockerfile via stdin/URL then always download
it a `Dockerfile` and ignore the -f flag.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 15924f238503ffe44e5fcb99415ff753a36e5971
Component: engine
2015-03-03 18:38:50 -08:00
72dd46b2de Notes should be indented
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 93c82360a6b530ef86769ee04e027f6159dc55da
Component: engine
2015-03-03 13:58:35 -08:00
8c703a14a3 Fix 'docker ps --help' so the options don't span more than one line
and add a testcase to catch this in the future.

While in there I also:
- removed extra periods from the few options that had them (new test)
- made the --filter option consistent across all command

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 5595da2bde6574fe13785f07c55a155a2e90a7ca
Component: engine
2015-03-03 10:02:23 -08:00
d382609cd2 Rebase & update api doc v1.18 instead
Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: dc0a6c1f5edd78d23ab676c54c3e84df3c2b2bbf
Component: engine
2015-03-03 12:32:17 +08:00
f947fbc4ae Add cors header flag and leave boolean flag not changed
Deprecate api-enable-cors

Update docs & man files

Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: f3dd2db4ff7de1399a49af928cd3eae4fccf8764
Component: engine
2015-03-03 11:21:19 +08:00
b8344b4ef2 Merge pull request #11060 from dmitrygusev/docs-improvements
Docs improvements typo fixes and consistency
Upstream-commit: 6bbf5c3e99d9943d6526a415de0875c441266eff
Component: engine
2015-03-02 06:46:17 -08:00
b10d9ac0eb Fix incorrect https example in mac.md (carry of 11063)
The document referenced https but was using the http port. I changed the
examples from https to http.

Also, fyi, when I tried accessing https using the correct 443 port, it
did not work. I have not investigated why. Port 80 worked fine.

For me:
jay-mac:.ssh jay$ docker port web
80/tcp -> 0.0.0.0:49153
443/tcp -> 0.0.0.0:49154
jay-mac:.ssh jay$ boot2docker ip
192.168.59.103

works: http://192.168.59.103:49153/
fails: https://192.168.59.103:49154/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1d4b2524ec080a19f47292020a7fb6a9a00c8932
Component: engine
2015-02-28 22:13:03 +01:00
4020847acb Update cli.md
Use `-it` combination in example instead of `-ti`, because this is how it used everywhere in examples.

Update dockerfile_best-practices.md

Fix typo in command name

Signed-off-by: Dmitry Gusev <dmitry.gusev@gmail.com>
Upstream-commit: 39b3690ba1801b36c1f43fa220ae5128958a0739
Component: engine
2015-02-27 23:18:32 +03:00
5bd9f0f7c0 Merge pull request #10902 from estesp/10855-fix-add-host-doc
Correct --add-host documentation regarding host IP address retrieval
Upstream-commit: 94553f1ba6bd9f26059fc909586fd95230676432
Component: engine
2015-02-26 17:25:01 -08:00
af49ab2e01 Add reference to docker-reg-client
Update the "Docker Remote API Client Libraries" documentation page to
include a reference to the Go-based docker-reg-client package.

Signed-off-by: Brian DeHamer <brian@dehamer.com>
Upstream-commit: 48354301659d870bd23e643c6e916a5a652ae93c
Component: engine
2015-02-26 13:03:39 -08:00
f6890f9c00 Smaller image
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: 02639c03b78e325f2e87e0fbcb4f1db4e04fe847
Component: engine
2015-02-26 08:48:58 -08:00
38df4a721b Merge pull request #10831 from MalteJ/ipv6-ndp-proxy
Adding IPv6 NDP Proxying documentation
Upstream-commit: 9324cdac07484373c752f3368c3cb30db070b839
Component: engine
2015-02-26 07:19:36 -08:00
d372e2ab22 update the mkdocs.yml to add new docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 6d4b0f53342f4b56ad0770bd0e1bce6fcd898a41
Component: engine
2015-02-26 12:11:29 +10:00
2e0ec2c817 Allow setting ulimits for containers
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3f39050637d454e9ee8075153a917c8bfccb5bae
Component: engine
2015-02-25 19:37:43 -05:00
47a091cc6c Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats
Implements stats for lxc driver
Upstream-commit: 9a2e58dd2940d11d3c8f22a0fabe54591a5e3619
Component: engine
2015-02-25 13:46:18 -08:00
9d92f5d059 Correct --add-host documentation regarding host IP address retrieval
Fixes: 10855

The example was actually incorrect for many situations, and also, now
that we have IPv6 we should not that the example is for IPv4 and note
how to find IPv6 addresses.  Also, the device they want to connect to
could be the bridge, or main ethernet device, or some other device
name, so note that as well.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: f8a146311d1ea1645e25b38910b717335bb684c0
Component: engine
2015-02-25 09:56:58 -05:00
4e766f5eaa pass --change changes to the import job
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 17abfc3ddc79592753289a8556a343e276fb15b5
Component: engine
2015-02-24 13:01:36 -05:00
2bc83bf87b add docs for commit --change
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 5767548fa79342cee94dbb66b9c41671d4a1879f
Component: engine
2015-02-24 13:01:36 -05:00
86eef40206 Merge pull request #10724 from SvenDowideit/takeover-10470
Update best practices for entrypoint.
Upstream-commit: 1d27930faaacf6ebe4553c7b23087e2164816470
Component: engine
2015-02-24 15:32:16 +10:00
351cb675a4 Merge pull request #10923 from bradleywright/patch-1
Fix erroneously wrapped URLs in links
Upstream-commit: ad2063ca8461a903fe993188b4dbaa5da804a72b
Component: engine
2015-02-24 15:31:40 +10:00
61ee3dd26f Merge pull request #10929 from thaJeztah/docs-optimize-images
docs: optimize and consolidate images, remove duplicates
Upstream-commit: e500c00d7cd855c02f390d1f9d55b668cc191854
Component: engine
2015-02-24 15:31:00 +10:00
f3462cd410 Merge pull request #10933 from ahmetalpbalkan/version-daemon-os-arch
cli: Add server OS/Arch info to 'version' cmd
Upstream-commit: 02c888159666ee53df9eeb1397c7d597dabf3b60
Component: engine
2015-02-23 15:26:53 -08:00
4fbdef753d cli: Add server OS/Arch info to 'version' cmd
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 3346c2e4d9ce0cf92b056b6ddc883adf5b8beddd
Component: engine
2015-02-23 14:32:25 -08:00
27d91a55a2 Have docker command use $HOME instead of 'mary'
Signed-off-by: Andrew Kuklewicz <andrew@beginsinwonder.com>
Upstream-commit: f9bb0afc6c37ea5b6f2d413474c5dcbdd84259f1
Component: engine
2015-02-23 12:37:11 -05:00
b907fd6bb4 docs: optimize and consolidate images, remove duplicates
This optimizes a number of images and removes a duplicate image.
Also consolidated images in the 'docker-hub' section.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 743f0bcc83b0b1b8ccc1980300e96a9003b5cd0f
Component: engine
2015-02-23 12:10:54 +01:00
848426a114 Implements stats for lxc driver
Implements stats and fixes stats test.

Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: 1a26ed09ee6199341297f5e5ef8c5ed30efb6596
Component: engine
2015-02-23 10:16:52 +00:00
f1c26b077c Merge pull request #10918 from cpuguy83/10278_fix_create_docs_for_volumes
Remove CLI doc entry related to API-only function
Upstream-commit: 7d2188f9955d3f2002ff8c2e566ef84121de5217
Component: engine
2015-02-22 18:11:18 -08:00
402ab2a4ba a little re-writing
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 3c9d45e2130e86c45da94aa00ce9a75e0d514e61
Component: engine
2015-02-23 12:00:50 +10:00
59491a1c4b Update best practices for entrypoint.
Despite being wrong we are kinda calling our users dumb, I feel it is a bit
demeaning. As well as just wrong.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: 6009f2eac4d8d707b64bfada507345e11977643d
Component: engine
2015-02-23 12:00:50 +10:00
cd135d371f Merge pull request #10930 from caryhartline/patch-1
Fix three spelling mistakes
Upstream-commit: 74394f03ac422fe79c049f37c469fdceac078ff7
Component: engine
2015-02-22 20:28:42 -05:00