centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 22:38:54 +07:00
Code Issues Packages Projects Releases Wiki Activity
20,632 Commits 54 Branches 28 Tags
27220ecc6b1eedf650ca9cf94965cb0dc2054efd
Commit Graph

20632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Calavera
27220ecc6b Move timeutils functions to the only places where they are used. 
- Move time json marshaling to the jsonlog package: this is a docker
  internal hack that we should not promote as a library.
- Move Timestamp encoding/decoding functions to the API types: This is
  only used there. It could be a standalone library but I don't this
it's worth having a separated repo for this. It could introduce more
complexity than it solves.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-12-15 14:56:14 -05: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
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
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
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
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
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
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
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
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
Sebastiaan van Stijn
8970337f60 Merge pull request #18649 from albers/completion-daemon--authz-plugin 
bash completion for `docker daemon --authz-plugin`
 2015-12-14 23:13:21 +01:00
Vincent Demeester
87740d001c Merge pull request #18644 from calavera/remove_timeout_func_dependency_from_api_lib 
Remove timeout shared function.
 2015-12-14 23:05:29 +01:00
Sebastiaan van Stijn
a7e30a4ffb Merge pull request #18643 from tianon/apt-get-clean 
Remove mention of "apt-get clean" as it's performed automatically
 2015-12-14 22:54:17 +01:00
David Calavera
83b5729f64 Remove httputils dependency from API client lib. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-12-14 16:48:59 -05:00
Alexander Morozov
260cbb19c9 Merge pull request #18486 from aboch/vnd 
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
 2015-12-14 13:32:01 -08:00
Harald Albers
069fe81fa6 bash completion for docker daemon --authz-plugin 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-12-14 13:25:45 -08:00
Alexander Morozov
ecc3717cb1 Merge pull request #18612 from mrunalp/update_runc 
Update runc/libcontainer to v0.0.6
 2015-12-14 13:05:53 -08:00
Tianon Gravi
226329e540 Remove mention of "apt-get clean" as it's performed automatically 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-12-14 12:50:44 -08:00
David Calavera
6e85d30f1b Merge pull request #18645 from sdurrheimer/zsh-completion-daemon-authz-plugin 
Zsh completion daemon authz plugin
 2015-12-14 12:50:14 -08:00
Steve Durrheimer
4ba173630a Fix small missing equal sign for 'docker daemon --cluster-store-opt' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-12-14 21:20:49 +01:00
Steve Durrheimer
76844d786b Add zsh completion for 'docker daemon --authz-plugin' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-12-14 21:16:54 +01:00
David Calavera
75d69ce0da Merge pull request #18637 from dnephin/move_auth_config 
Move more api types to api/types package
 2015-12-14 11:53:30 -08:00
Jess Frazelle
0c2dd27581 Merge pull request #18642 from tophj-ibm/add-z-unshare-image 
Add unshare image to s390x Dockerfile
 2015-12-14 11:32:27 -08:00
David Calavera
9dc7d07fc1 Remove timeout shared function. 
Handle timeouts when it's necessary based on a Timeout interface.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-12-14 14:24:21 -05:00
David Calavera
984282e28c Merge pull request #18639 from calavera/force_api_version 
Force API versioning in the client library.
 2015-12-14 11:20:12 -08:00
Jess Frazelle
03e2923e42 Merge pull request #18570 from suihkulokki/control-fix 
hack/make/.build-deb/control: add missing fields
 2015-12-14 10:41:56 -08:00
Jess Frazelle
b13fd10109 Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen 
Windows CI Fix: No subshell due to bash 3.x
 2015-12-14 10:32:53 -08:00
Christopher Jones
52e53814ea Add unshare image to s390x Dockerfile 
This adds unshare image to Dockerfile.s390x

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2015-12-14 12:16:18 -06:00
Jess Frazelle
c38aa60180 Merge pull request #18393 from qzio/apparmor/ptrace-ubuntu14 
Enable ptrace in a container on apparmor below 2.9
 2015-12-14 10:07:01 -08:00
David Calavera
b679eb9a82 Force API versioning in the client library. 
Remove dependencies on docker's version packages.
Allow empty version as a fallback to latest version.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-12-14 12:06:42 -05:00
Daniel Nephin
96c10098ac Move IndexInfo and ServiceConfig types to api/types/registry/registry.go 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-12-14 11:28:02 -05:00
Tibor Vass
44299989b2 Merge pull request #18631 from tiborvass/cleanup-utils 
Create `builder/dockerignore` and `pkg/gitutils` to clean up `utils`
 2015-12-14 17:22:01 +01:00
Daniel Nephin
5b321e3287 Move AuthConfig to api/types 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-12-14 11:22:01 -05:00
toli
0d824c760e Removing the restriction to push to a 'official' repo 
Signed-off-by: toli <toli@docker.com>
 2015-12-14 07:45:00 -08:00
Vivek Goyal
f988c98ff3 Add some unit and integration tests 
Add a unit test and couple of integration tests for volume propagation.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
 2015-12-14 10:39:53 -05:00