1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Daniel Nephin
e226383614 Move the TestEncodeAuth test to the correct package.
Also make EncodeAuth and DecodeAuth private because they're only used by cliconfig.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-15 13:36:52 -05:00
Olivier Gambier
bf09bb1314 Merge pull request #1267 from gabriellhrn/typo
Fix typo in docs/configuration.md
2015-12-15 10:22:07 -08:00
Ying Li
63f48791c3 Fix docstring for 'key-type' parameter on key rotate.
Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-15 10:18:58 -08:00
gabriell nascimento
74255cd4f2 Fix typo in docs/configuration.md
Signed-off-by: Gabriell Nascimento <gabriellhrn@gmail.com>
2015-12-15 16:14:13 -02:00
Jess Frazelle
2180dd6cf0 Merge pull request #18617 from tiborvass/cleanup-builder
Cleanup builder: remove container package dependency
2015-12-15 09:59:29 -08:00
Brian Goff
ce0b1841c8 Merge pull request #17034 from rhvgoyal/volume-propagation
Capability to specify per volume mount propagation mode
2015-12-15 12:14:41 -05:00
Tianon Gravi
42ea7a8a93 Merge pull request #18097 from btorresgil/kali-linux-2.0-installer
Add support for installation on Kali Linux 2.0
2015-12-15 08:52:53 -08:00
Jess Frazelle
adf1ffd53b Merge pull request #18416 from toli/disable-official-repo-check-in-push
Removing the restriction to push to an 'official' repo
2015-12-15 08:52:36 -08:00
Antonio Murdaca
4133dc2212 pkg: plugins: fix and better handle errors
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-15 17:51:48 +01:00
Alexander Morozov
812a7c204a Merge pull request #18531 from coolljt0725/update_container_networking_on_create
fix docker inspect return unconsistent network settings  of created container and stopped container
2015-12-15 08:47:54 -08:00
Daniel Nephin
c4472b389d Move registry.SearchResult types to api/types/registry.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-15 11:44:20 -05:00
Tibor Vass
93c0de2af4 builder: remove unused Retain/Release and put Mount/Unmount back
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-15 17:24:07 +01:00
Tibor Vass
c70f8b3c9c builder: remove container package dependency
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-15 17:24:07 +01:00
Tibor Vass
2a2d1f57b5 dockerfile: get rid of Commit and CommitConfig
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 400e4922cbd004b93774fc55005f74bd8a995242)
2015-12-15 17:23:40 +01:00
Ray Tsang
22023e05a3 Updated REX-Ray plugin platform support.
REX-Ray added Google Compute Engine support: https://github.com/emccode/rexray/issues/113

Signed-off-by: Ray Tsang <rayt@google.com>
2015-12-15 11:21:19 -05:00
Sebastiaan van Stijn
06ce22c6e6 Merge pull request #18669 from mqliang/patch-1
fixed typo
2015-12-15 16:06:58 +01:00
Liang Mingqiang
4c1243dc76 fixed typo
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-15 23:00:47 +08:00
Bryan Boreham
c170e97197 Explain 'json' function a bit better
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-12-15 13:41:47 +00:00
Sebastiaan van Stijn
effdb3b763 Merge pull request #18664 from mqliang/patch-1
fix typo in runmetrics.md
2015-12-15 13:13:36 +01:00
Vincent Demeester
7fe5631b5e Merge pull request #18661 from zhanghuanzhong/docker-fix-a-confused-variable
The logName is confused here, it's a localName actually.
2015-12-15 12:32:52 +01:00
Vincent Demeester
b32713bed1 Merge pull request #18606 from runcom/dmwtf
devmapper: store base device fs type
2015-12-15 12:22:15 +01:00
Liang Mingqiang
941bbd57ac fix typo in runmetrics.md
fix typo

Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-15 19:14:47 +08:00
David Gageot
fb916f2389 Merge pull request #2580 from londoncalling/18282_cloud_installs
minor updates to add Digital Ocean example heading and more links to …
2015-12-15 11:56:10 +01:00
David Gageot
ffdf19c562 Merge pull request #2583 from jeanlaurent/softlayer-doc
FIX #2577 - Softlayer doc
2015-12-15 11:55:46 +01:00
Jean-Laurent de Morlhon
b85efca4f0 Merge pull request #2584 from dgageot/2561-pubkey-username
FIX #2561 SSH pubkey should have username comment
2015-12-15 11:54:42 +01:00
Jean-Laurent de Morlhon
87e0e2597e Merge pull request #2582 from dgageot/improve-makefile
Improve makefile
2015-12-15 11:54:18 +01:00
Sebastiaan van Stijn
98d97743d2 Merge pull request #18536 from WeiZhang555/daemon-err
Better error message for invalid unix socket format
2015-12-15 11:51:47 +01:00
David Gageot
ffd70ac33a Remove invalid target
Signed-off-by: David Gageot <david@gageot.net>
2015-12-15 11:17:37 +01:00
David Gageot
35ff801ae4 make build should build if any go file is touched
Signed-off-by: David Gageot <david@gageot.net>
2015-12-15 11:17:37 +01:00
David Gageot
72d2fb6b27 Remove duplication
Signed-off-by: David Gageot <david@gageot.net>
2015-12-15 11:17:37 +01:00
David Gageot
54293d727b Use the makefile to compute the checksums
Signed-off-by: David Gageot <david@gageot.net>
2015-12-15 11:17:37 +01:00
David Gageot
ff5dc0c644 No need to archive the binaries anymore
Signed-off-by: David Gageot <david@gageot.net>
2015-12-15 11:17:37 +01:00
David Gageot
4fb50623b5 Cross build binaries directly in bin
Signed-off-by: David Gageot <david@gageot.net>
2015-12-15 11:17:37 +01:00
David Gageot
b995a4d65a FIX #2561 SSH pubkey should have username comment
Signed-off-by: David Gageot <david@gageot.net>
2015-12-15 11:12:53 +01:00
Jean-Laurent de Morlhon
20c2293f9f FIX #2577 - Softlayer doc
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-15 10:53:43 +01:00
Jeffrey Morgan
97ff791398 Improved modify path text in Windows installer
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-15 01:09:36 -08:00
Jeffrey Morgan
fdc9e81947 Bump versions
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-15 00:56:04 -08:00
Jeffrey Morgan
e95cada26c Fix bug where docker start.sh on windows would error when VM is running
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-12-15 00:53:54 -08:00
Antonio Murdaca
f22ee02c6d devmapper: store base device fs type
After the very first init of the graph `docker info` correctly shows the
base fs type under `Backing Filesystem`. This information isn't stored
anywhere. After a restart (w/o erasing `/var/lib/docker`) `docker info`
shows an empty string under `Backing Filesystem`.
This patch records the base fs type after the first run in the metadata
or, to fix old devices that don't have this info in the metadata, just
probe the fs type of the base device at graph startup.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-15 09:33:19 +01:00
Vincent Demeester
6c0c199103 Merge pull request #18659 from Mashimiao/blkio-bps-tfix
tfix: modify internal variable name to be lower-case
2015-12-15 09:20:15 +01:00
huanzhong zhang
badfc7e10f The logName is confused here, it's a localName actually.
Signed-off-by: huanzhong zhang <zhanghuanzhong90@gmail.com>
2015-12-15 15:21:28 +08:00
Andrea Luzzardi
7291ec144c Merge pull request #1544 from yangdongsheng/sort
api: Sort images by Created.
2015-12-14 22:11:03 -08:00
Dongsheng Yang
5aecaddf72 api: Sort images by Created.
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
2015-12-15 13:15:00 +08:00
Phil Estes
a398536d5e Merge pull request #18638 from cdituri/16667-devmapper-common-message-prefix
Make all the devmapper log messages consistent with a common prefix.
2015-12-15 00:08:00 -05:00
Arnaud Porterie
2ec34dca05 Merge pull request #18650 from calavera/remove_httputils_dep_from_api
Remove httputils dependency from API client lib.
2015-12-14 20:51:53 -08:00
Chris Dituri
9b584781ad Make pkg/devicemapper/ log messages with a common, consistent prefix.
Closes #16667

Uses the prefix "devicemapper:" for all the fmt and logrus error, debug, and info messages.

Signed-off-by: Chris Dituri <csdituri@gmail.com>
2015-12-14 21:35:15 -06:00
Chris Dituri
0aa6ace6e6 Make daemon/graphdriver/devmapper log messages with a common, consistent prefix.
Closes #16667

Uses the prefix "devmapper:" for all the fmt and logrus error, debug, and info messages.

Signed-off-by: Chris Dituri <csdituri@gmail.com>
2015-12-14 21:35:13 -06:00
Ahmet Alp Balkan
755f8609f6 Add containers’ networks to /containers/json
After addition of multi-host networking in Docker 1.9, Docker Remote
API is still returning only the network specified during creation
of the container in the “List Containers” (`/containers/json`) endpoint:

    ...
    "HostConfig": {
      "NetworkMode": "default"
    },

The list of networks containers are attached to is only available at
Get Container (`/containers/<id>/json`) endpoint.
This does not allow applications utilizing multi-host networking to
be built on top of Docker Remote API.

Therefore I added a simple `"NetworkSettings"` section to the
`/containers/json` endpoint. This is not identical to the NetworkSettings
returned in Get Container (`/containers/<id>/json`) endpoint. It only
contains a single field `"Networks"`, which is essentially the same
value shown in inspect output of a container.

This change adds the following section to the `/containers/json`:

    "NetworkSettings": {
      "Networks": {
        "bridge": {
          "EndpointID": "2cdc4edb1ded3631c81f57966563e...",
          "Gateway": "172.17.0.1",
          "IPAddress": "172.17.0.2",
          "IPPrefixLen": 16,
          "IPv6Gateway": "",
          "GlobalIPv6Address": "",
          "GlobalIPv6PrefixLen": 0,
          "MacAddress": "02:42:ac:11:00:02"
        }
      }
    }

This is of type `SummaryNetworkSettings` type, a minimal version of
`api/types#NetworkSettings`.

Actually all I need is the network name and the IPAddress fields. If folks
find this addition too big, I can create a `SummaryEndpointSettings` field
as well, containing just the IPAddress field.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-12-14 19:03:23 -08:00
Zhang Wei
20012e423c Better error message for invalid unix socket format
Give more meaningful error prompts when user try to bind a directory as
unix socket.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-12-15 10:05:58 +08:00
Ma Shimiao
38797ca61b tfix: modify internal variable name to be lower-case
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-15 09:50:16 +08:00