centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-30 15:58:53 +07:00
Code Issues Packages Projects Releases Wiki Activity
42,268 Commits 54 Branches 28 Tags
b244267e7f5841f9857506d7e5bdf883cced1663
Commit Graph

42268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Mulhausen
b244267e7f Create Gemfile.lock 2016-09-30 18:47:12 -07:00
John Mulhausen
f4fd119842 Move of cloud-api-docs 2016-09-30 18:44:57 -07:00
John Mulhausen
9c299f5238 Pic fix 2016-09-30 18:13:45 -07:00
John Mulhausen
c35362633c Fixes for snippets in lists 2016-09-30 16:41:43 -07:00
John Mulhausen
79fb2534f2 Fix for snippet-within-list 2016-09-30 16:22:45 -07:00
John Mulhausen
37c8021e42 Fix for nested Docker Engine TOC 2016-09-30 14:30:40 -07:00
John Mulhausen
7c615e83a3 All page links 2016-09-30 14:13:15 -07:00
John Mulhausen
0133cb646d Merge pull request #21 from pborreli/typos 
Fixed typos
 2016-09-30 11:51:42 -07:00
John Mulhausen
7e8b6603d6 Merge pull request #20 from mstanleyjones/add_migration_readme 
Add migration details
 2016-09-30 11:30:35 -07:00
Misty Stanley-Jones
6c71c030ab Add migration details 2016-09-30 10:20:01 -07:00
John Mulhausen
066b78bf86 Content rendering fixes 2016-09-30 01:51:56 -07:00
John Mulhausen
82d33c504a Delete LICENSE 2016-09-30 00:33:31 -07:00
John Mulhausen
0ad083ff1f Delete Makefile 2016-09-29 23:40:58 -07:00
John Mulhausen
d8b7717467 Delete Dockerfile 2016-09-29 23:40:48 -07:00
John Mulhausen
99bab305bd Removing merge detritus 2016-09-29 23:38:12 -07:00
John Mulhausen
843b052401 Fix for in-page anchor links 2016-09-29 22:56:42 -07:00
John Mulhausen
42964d8b7d Removing empty front-matter 2016-09-29 22:39:30 -07:00
John Mulhausen
69b61e1fb9 http only for AWS 2016-09-29 19:43:26 -07:00
John Mulhausen
b58c93bb40 Fixes for forwarding, custom 404 2016-09-29 19:39:14 -07:00
John Mulhausen
1465790db0 Custom 404, Docs Archive, Archive Forwarding 2016-09-29 18:55:02 -07:00
Pascal Borreli
6cd3fe8bd2 Fixed typos 2016-09-30 01:52:12 +01:00
Misty Stanley-Jones
d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones
9f31bb790d Put back inadvertently deleted compose directory 2016-09-29 12:13:47 -07:00
Misty Stanley-Jones
5f5eb93dfa Moved pinata imported docs to top level subdirectory 2016-09-29 12:11:53 -07:00
Misty Stanley-Jones
3165f14c78 Initial import of https://github.com/docker/pinata 2016-09-29 12:11:03 -07:00
Misty Stanley-Jones
978130dcf4 Moved docs to docker-cloud 2016-09-29 11:35:02 -07:00
Misty Stanley-Jones
15efc2d851 Initial import of https://github.com/docker/cloud-docs 2016-09-29 11:31:42 -07:00
Misty Stanley-Jones
9d5e59d503 Moved engine imported docs to the engine subdirectory 2016-09-29 11:19:31 -07:00
Misty Stanley-Jones
6a54b082a8 Initial import of https://github.com/docker/docker 2016-09-29 11:17:56 -07:00
Misty Stanley-Jones
3134c23b55 Merge pull request #27040 from mstanleyjones/fix_labels_nav_pick 
Merge pull request #27036 from mstanleyjones/fix_labels_nav
 2016-09-29 11:12:42 -07:00
Misty Stanley-Jones
a114655b56 Merge pull request #27036 from mstanleyjones/fix_labels_nav 
Fix menu position of the labels-custom-metadata.md topic
(cherry picked from commit a3286783bcfbfd6e58d16e1b189138580b08facc)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-29 11:05:34 -07:00
Misty Stanley-Jones
701f170a21 Move docker-hub docs to docker-hub subdirectory 2016-09-29 10:38:52 -07:00
Misty Stanley-Jones
4d1a62276e Imitial import of https://github.com/docker/hub2-demo 2016-09-29 10:35:53 -07:00
Sebastiaan van Stijn
88ce3d60b9 Merge pull request #27032 from mstanleyjones/fix_image_link_pick 
Merge pull request #27031 from mstanleyjones/fix_broken_image_link
 2016-09-29 19:27:49 +02:00
Sebastiaan van Stijn
ed69445474 Merge pull request #27031 from mstanleyjones/fix_broken_image_link 
Revert "Add direct link to event chart image"
(cherry picked from commit 6f07a4a69b17d6a1bf902a5ec30ad046645e9c23)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-29 10:23:10 -07:00
Sebastiaan van Stijn
cd15b2b300 Merge pull request #27022 from thaJeztah/docs-cherry-picks-1.12.2 
Docs cherry picks 1.12.2
 2016-09-29 17:58:12 +02:00
Misty Stanley-Jones
68aca71637 Fix link to non-existent file 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit ca04f02d7655e7306c7c0cde6fa1895a14f0a673)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:29:07 +02:00
Victoria Bialas
735622fdf4 added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 0a76a4cb5bdb83c1c62832d084ae47a0c50646bc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:29:00 +02:00
Sebastiaan van Stijn
ca474f7808 Fix incorrect aux-address examples and test 
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.

Before this change, the example command
would send this API request;

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "a": "192.170.1.5",
              "b": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

After this change, the request looks
like this (all aux-addresses preserved);

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "AuxiliaryAddresses": {
              "my-router": "192.168.1.5",
              "my-switch": "192.168.1.6"
            },
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "my-printer": "192.170.1.5",
              "my-nas": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fd7161bb3061e2e2f56faed1a4ba1f7a887627bf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:52 +02:00
allencloud
c93303b8d7 move mcvlan out of experimental docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 6e4ec046f4a267083b1bd07028d1b68eb248a950)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:35 +02:00
yuexiao-wang
96b5ec8f50 Fix the broken link 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit cfb07e642d23622412c5455ca70c42140268f9fe)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:29 +02:00
yuexiao-wang
394ce0c9c1 Fix typo for how pki works 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit bf9c6d3115dd388cf379ec1a80d29104521a7b42)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:22 +02:00
lixiaobing10051267
729717568b the network id is not consistant with the real id created 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 392aae44fd8ea5755305104e1c2a1c85f39d4a07)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:16 +02:00
Sebastiaan van Stijn
fc884da817 Add missing API docs for "privileged" and "user" exec 
The "user" feature was added in docker 1.7.0, and
"privileged" feature was added in docker 1.9.0
only contained CLI docs.

This adds the missing API docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c53efdf4c1f0b2e7f1fe04294d9d64401b8b09b8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:09 +02:00
Hans Kristian Flaatten
9363b42e59 docs: add missing 'on' in Oracle installation guide 
Signed-off-by: Hans Kristian Flaatten <hans.flaatten@evry.com>
(cherry picked from commit 838fe65e5332dd79f5cf8551d70906d9801f79fb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:02 +02:00
Jeff Silberman
2659333a27 Add Portworx Volume Plugin Description 
Signed-off-by: Jeff Silberman <jsilberm@gmail.com>
(cherry picked from commit da2159ea1c366ac64b0f498a8aca0ee595dae558)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:55 +02:00
Misty Stanley-Jones
67610e9dea Restructure content about Docker object labels 
A few points of work:

- Took the topic out of the left-hand nav and made it
  reachable from the User guide intro

- Condensed the topic's contents, presenting only conceptual
  info and pointing instead to the command-line references
  for each type of object

- Added brief information about the `LABELS` keyword to the
  Dockerfile reference

A big part of the point is to establish a pattern of
thinking and use around how Docker uses labels and what they
mean in different contexts.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 5c4c062ffcdb8d7b8c104fd667571279c51d2ffd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:48 +02:00
Sebastiaan van Stijn
121cd6f9e6 Fix incorrectly named API options 
This renames `MaximumIOps` to `IOMaximumBandwidth`,
and `MaximumIOBps` to `IOMaximumIOps` to match
the actual code.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 36a25bdbe4d973aef308fa11b450264dae1bc0b4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:41 +02:00
yuexiao-wang
d4288a3212 Update on index refernce documentation 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit 0483d776130aa6b7add845bdab3d1d8ee67f7480)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:34 +02:00
Sebastiaan van Stijn
cdda81146b Update API docs for "HostConfig.Binds" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 708892c4037e9eef6f6c25b5a3551f7779fb8868)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:27:27 +02:00