Commit Graph

94 Commits

Author SHA1 Message Date
f475565e21 Add Kitematic documentation to docs.master.docker.com
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 82bd3886d54da4fcbcd29cde957568a75ecd186e
Component: engine
2015-05-20 01:57:45 +00:00
61e72a4efb Bring /info API doc in line with the actual response.
The fix handles versions 1.18 and 1.19.

Closes #13139.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: 9c0608565c93a31d6885842376e82a19db5a7af4
Component: engine
2015-05-18 13:55:42 -04:00
133eb58df5 DHE 1.0.1 release
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 38af208da1414dad81dbd96d7d8678bfb94f9dc0
Component: engine
2015-05-11 21:23:56 +00:00
319058a95b Add a userguide to cover the uses of Hub before creating new repositories
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 9da3a848abea56dff960baa8428dc073b70ec1de
Component: engine
2015-05-07 00:31:04 +00:00
72fc3b7751 journald log driver: use CONTAINER_ID field for container id
This patch modifies the journald log driver to store the container ID in
a field named CONTAINER_ID, rather than (ab)using the MESSAGE_ID field.
Additionally, this adds the CONTAINER_ID_FULL field containing the
complete container ID and CONTAINER_NAME, containing the container name.

When using the journald log driver, this permits you to see log messages
from a particular container like this:

    # journalctl CONTAINER_ID=a9238443e193

Example output from "journalctl -o verbose" includes the following:

    CONTAINER_ID=27aae7361e67
    CONTAINER_ID_FULL=27aae7361e67e2b4d3864280acd2b80e78daf8ec73786d8b68f3afeeaabbd4c4
    CONTAINER_NAME=web

Closes: #12864
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: 869ecba652294e069874c83591d6f1b469d7cc32
Component: engine
2015-04-30 10:42:27 -04:00
d9d6af7cf9 Merge pull request #12644 from psftw/official-repos-rewrite
Rewrite Official Repos page.
Upstream-commit: dde5ff2872bb76ccbc279f4cd52d7c75565a3b75
Component: engine
2015-04-28 08:57:29 -07:00
00b8817331 Rewrite Official Repositories page.
The existing page is focused on listing a set of requirements for
proposing a new repository.  This information has become outdated and is
duplicated in the `docker-library/official-images` and
`docker-library/docs` GitHub repositories.  This PR rewrites the
Official Repositories page to describe what they actually are, and
defers to GitHub/IRC for the subset of users that are interested in
contributing.  I also removed the requirement to contact
partners@docker.com and made it optional to reduce the barrier to entry.

Signed-off-by: Peter Salvatore <peter@psftw.com>
Upstream-commit: 8f52eb7b827d658d6974056460afd722a5cb040f
Component: engine
2015-04-28 00:37:17 -04:00
1a5a13dff9 add initial docs for windows client testing
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

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

docs: crop and optimize images

Cropped and optimized images.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

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

Testing and updating the Windows material

Signed-off-by: Mary Anthony <mary@docker.com>

checkpoint

Signed-off-by: Mary Anthony <mary@docker.com>

Fitting the Windows specific material into the contributor guide

Signed-off-by: Mary Anthony <mary@docker.com>

Entering James comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: af8efab7561484debffa3f6782eaea199fa22506
Component: engine
2015-04-27 21:21:53 -07:00
9d65fe4b0e Copy over the DHE documentation for release to docs.docker.com
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: b0ad95daa84354c4b41679d0182fafbd259e5a69
Component: engine
2015-04-24 12:39:58 +10:00
be8a515938 make space for DHE menu item again
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 493437616d1aabef50768d71ce786595f7295554
Component: engine
2015-04-24 12:39:49 +10:00
701a9fb9a1 Makes headings in documentation consistent
Fixes #10673.

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: 63593267619378520a03e8984c5fcf0ec8957537
Component: engine
2015-04-23 07:41:30 +02:00
8db174e734 Merge pull request #12615 from moxiegirl/update-repository-links
Fixing a few links in registry
Upstream-commit: b6702116be4c554e7856017bfde62e1a23c0e349
Component: engine
2015-04-23 10:02:02 +10:00
18e1b423ee Fixing a few links in registry
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 54ff1dcb829e67d62dd4686bdc19522d63c3e0d3
Component: engine
2015-04-21 18:36:37 -07:00
6284903b5f Add Configuring Docker article [WIP]
Fixes #12088

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 9424fc14bb7465f9874e6e3560cf62b560dbd13d
Component: engine
2015-04-21 17:49:29 -07:00
d18c57d820 Docker Registry Server > Docker Registry
Fixing registry index
Tested on beta and this redirect works

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7b2b7df3866d0c0101e9367b7f4f63bfed5faac4
Component: engine
2015-04-18 19:19:48 -07:00
f4a4f24956 Updates to Compose docs and ENV vars
- Compose teamhad forgotten some documentation
- Updated ENV for Distribution also
- Forgot one of the readability sections

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 3a883672417fcb2b3ac0d57d992285849840bfb2
Component: engine
2015-04-17 13:08:57 -07:00
0e1a426ed8 In with the old menu layout
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fe8fb24b530016e56ab584526c093daccacf6040
Component: engine
2015-04-15 19:02:01 -07:00
589be08227 HTTPS URLs for docs top-level & man pages
This updates all of docs outside of sources.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: ac65c8c3801385c8278e0740ef2738b0aa56689a
Component: engine
2015-04-11 13:43:26 -04:00
cd5f423b1f Bump API version and docs to v1.19
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 81f9b72c648142745c63ab0ba2b495646dccd88d
Component: engine
2015-04-01 13:40:56 -07:00
a0e1171855 Add Glossary to documentation
Closes #11057

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 567f723721b7bac57a91d82d27472e568a101c4f
Component: engine
2015-03-29 12:24:54 -07:00
d4497c7a2b .: remove trailing white spaces
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 7617ec176d266650b19c2378ccab4aa41e6dc5a2
Component: engine
2015-03-25 13:38:17 -04:00
7cd85af5c7 Merge branch 'master' of github.com:docker/docker into joyentinstall
Reolved conflict in:
	docs/mkdocs.yml

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: a71d89d041d7853698c84ccf233f477383a9dcb3
Component: engine
2015-03-22 18:19:27 -07:00
7772935737 updated text
per recommendations in https://github.com/docker/docker/pull/11062#issuecomment-82435939

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: 19e3db35039ae80409623266906093b2314bd970
Component: engine
2015-03-20 14:44:24 -07:00
40e97918dc docs: Add Azure installation instructions
Adding instructions that refers to the Microsoft Azure
documentation on creating Docker-ready Linux VMs on Azure
platform.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 72fa3fcaeacfcfebdad463d965ff1d6a3e95d516
Component: engine
2015-03-19 21:28:29 -07:00
cf394b41e4 # This is a combination of 2 commits.
# The first commit's message is:

Updating Ubuntu installation to use wget; eliminating elo

Signed-off-by: Mary Anthony <mary.anthony@docker.com>

# This is the 2nd commit message:

Adding in James comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f60ed98e79fbc91e7aa280769c62c5a59c7eba00
Component: engine
2015-03-17 10:15:46 -07:00
43ac3e6d56 Updating with Sven's comments and other tweaks
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 6ddfe883dd0d6ce1f97a121652927ac1b1dbaefe
Component: engine
2015-03-16 21:49:33 -07:00
5f00f97ea0 Merge pull request #9882 from ibuildthecloud/labels
Proposal: One Meta Data to Rule Them All => Labels
Upstream-commit: b6ac111abfbed628a80b67f0b092a248083b354c
Component: engine
2015-03-16 20:20:05 -07:00
845f59abb0 Documentation changes for labels
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: fae92d5f0a1d81a48dc210d5ae28ef83c724b5ac
Component: engine
2015-03-16 17:08:40 -07:00
8f90223a50 Merge pull request #11321 from duglin/CmdLineTweak
Add "Docker" to Reference pull-down for Command Line
Upstream-commit: 495f5e4998d5d6d4eb2115a196cb33ae7716ab9b
Component: engine
2015-03-14 21:04:25 -06:00
f9d0cdbb89 Add labels documentation
Adds more documentation for labels and adds the label instruction to the
man-pages.

Also included is a document called "Labels - custom meta-data in Docker"
in the user-guide, this is still a work-in-progress I started to describe
the "namespaces" conventions, an example on storing structured data.

I ran a bit "out of steam" (writers block?) on that document, but kept
it in (for now), in case it still ends up useful.

The Remote API documentation changes will need to be moved to the
docker_remote_api_v1.18.md document when rebasing the whole PR.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 7d89e66dac59999ae2f07970b273e227fdf73ea7
Component: engine
2015-03-13 10:02:04 -07:00
65389ed10a Breaking out the project into more granular pieces
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: ec728939b167a32226d7556af38a51d3bc3a1b9e
Component: engine
2015-03-12 22:27:49 -07:00
36e8ea64f1 Add "Docker" to Reference pull-down for Command Line
A minor thing, but I noticed that the "Reference" drop-down menu just
says "Command line".  This was fine when we just had one command line,
but now there's also 'Compose command line' and I suspect we may add
others later.  We should qualify the Docker one with the word "Docker"
in front

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 779dca61e56696193de6fd5cbacdaba6c8f974ea
Component: engine
2015-03-11 07:43:33 -07: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
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
119882d0e4 Manually place the orchestration docs into the menu
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ac47a877403a894ac02724aaa111870edc7c2f8b
Component: engine
2015-02-26 11:41:39 +10:00
17fe06fc30 Don't require Docker 1.5.0 for docker build -f docs/Dockerfile
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 8d4459fffb5c1885b65506093538e059f0b51d90
Component: engine
2015-02-26 11:41:39 +10:00
824b119187 Import docs from swarm, machine and compose repositories,
Also add the image spec from the code area to show we're building from the repo-root now

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 3e84b9e56abdff7230e84a1830085c79c73aa3b7
Component: engine
2015-02-26 11:41:39 +10:00
5c56835bc1 Bump api version to 1.18
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d92b4232f7c7cb64efd8e56c33238b4426fe22af
Component: engine
2015-02-10 10:48:54 -08:00
88b86ea3ea Merge pull request #10523 from SvenDowideit/hide-more-old-docker-api-docs
The reference menu is too big to list more than the latest API docs, so ...
Upstream-commit: 6081a3ca90f7994ae19d22009e3691de03afad14
Component: engine
2015-02-06 19:26:01 +10:00
b2714755f7 The DHE documentation will not be published with 1.5.0
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 9867dfa6176c000f1afe25316f67f4d409b2b177
Component: engine
2015-02-05 10:26:53 +10:00
3866315ae2 The reference menu is too big to list more than the latest API docs, so the others can be hidden - they're still linked from the API summary
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 072fbf92714e121f92b0599740444e4cc28c4fee
Component: engine
2015-02-03 14:04:08 +10:00
00303c7fa9 DHE documentation placeholder and Navbar changes
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 0ce3a49d64bcfd81823fe0e9bf54c51ddf6e35d4
Component: engine
2015-01-29 20:50:43 +10:00
6813c73a03 Add the registry mirror document to the menu
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 1d04cc513a958009131ca54bd6904be14fef774e
Component: engine
2015-01-28 10:47:11 +10:00
8015360eaf update copyrights to 2015
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: e5869b2b0bdf85d15813c714565fd49943c3d754
Component: engine
2015-01-12 22:47:36 +00:00
5f20ff67a9 Make API docs v1.17 visible
w/o this one-liner the v1.17 docs didn't appear in the Reference dropdown
and I would get a 404 when I tried to access
.../reference/api/docker_remote_api_v1.17/

Not sure if there are other spots that need to be fixed but this seemed to
fix it for me.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 7275cd4bbccb9a3b3ea6b9422a59a092fb08bf8d
Component: engine
2015-01-07 20:14:45 -08:00
85fa2dc157 redirect openSUSE docs to SUSE doc
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: de2a91970dfd1f6078179ffffd63ec1842c95bd9
Component: engine
2014-12-18 09:05:27 +10:00
be6e29bd97 Extract the systemd docs from various places and add a little more
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: d53b586ff1b274b529b7912df3052a1bc2ca8dfe
Component: engine
2014-11-27 10:17:46 +10:00
49ecfd85ad Remove the redundant include_search in mkdocs.yml
Upstream-commit: b92d7cd60db0a03b0ace62a2a6c11df9f64f4256
Component: engine
2014-11-10 20:23:46 +08:00
fce9329c80 Docs edits for dropping SSLv3 and under + release notes for 1.3.1
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	docs/sources/index.md

Conflicts:
	docs/sources/index.md
Upstream-commit: e43d9f713e96daed521034995c00375544f62827
Component: engine
2014-10-30 19:44:42 -04:00