34f54b3a11
Merge pull request #22549 from allencloud/make-pkg-parsers-support-darwin
...
add darwin support in package docker/pkg/parsers
2016-06-02 10:48:19 -07:00
cb8e7470be
Merge pull request #23208 from vdemeester/update-engine-api
...
Bump engine api to 009ba16
2016-06-02 09:30:57 -07:00
afc2579d1a
Fix release-deb script
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-02 08:53:33 -07:00
f69353a364
Merge pull request #23153 from AkihiroSuda/fix23152PkgGitutils
...
Fix gitconfig dependency in pkg/gitutils.TestCheckoutGit
2016-06-02 17:21:38 +02:00
09033b8df2
Merge pull request #23179 from kerneltime/master
...
Add VMware Docker Volume Plugin.
2016-06-02 17:05:32 +02:00
6b7f12650d
Update ContainerStart calls to use options now
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-02 16:56:13 +02:00
8ea051f012
Update engine-api to 009ba1641d669613b38818f6f6385b0e74c5728f
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-02 16:55:49 +02:00
0da0a8f9da
Add support for reading journal extras and in UTC
...
When told to read additional attributes from logs that we've sent to the
journal, pull out all of the non-trusted, non-user fields that we didn't
hard-code ourselves. More of PR#20726 and PR#21889.
When reading entries in the journald log reader, set the time zone on
timestamps that we read to UTC, so that we send UTC values to the client
instead of values that are local to whatever timezone dockerd happens to
be running in.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2016-06-02 10:17:07 -04:00
80b3e9e810
Merge pull request #23183 from caarlos0/permissions
...
Removed exec permissions from Dockerfile.windows
2016-06-02 16:10:37 +02:00
171af54931
Merge pull request #22460 from jwhonce/wip/sigpipe
...
Ignore SIGPIPE events
2016-06-02 16:05:22 +02:00
0aeac288a3
Merge pull request #23161 from AkihiroSuda/rename-misleading-function-name
...
daemon: Rename copy to copyFunc
2016-06-02 15:31:08 +02:00
322cc99c69
Need to create bind mount volume if it does not exist.
...
In order to be consistent on creation of volumes for bind mounts
we need to create the source directory if it does not exist and the
user specified he wants it relabeled.
Can not do this lower down the stack, since we are not passing in the
mode fields.
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-06-02 07:14:17 -04:00
22aca92ee3
Merge pull request #23121 from unclejack/disallow_ecryptfs_aufs
...
aufs,overlay: disable on eCryptfs
2016-06-02 12:54:43 +02:00
69545fe19d
Merge pull request #23190 from AkihiroSuda/addendum23141
...
Fix the comment for daemon/logger.Copier
2016-06-02 12:21:52 +02:00
c1be45fa38
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-02 17:17:22 +08:00
efc250bc6b
Fix gitconfig dependency in pkg/gitutils.TestCheckoutGit
...
Fix #23152
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-02 17:44:09 +09:00
b02acfcbe0
Merge pull request #23197 from coolljt0725/cleanup_comment
...
cleanup: clean up commented code in daemon/stats.go
2016-06-02 10:12:10 +02:00
2d9c022946
cleanup: clean up commented code in daemon/stats.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-06-02 14:39:12 +08:00
53a1de2b16
Fix the docker daemon restart command for ubuntu.
...
Signed-off-by: Senthil Kumaran <senthil@uthcode.com>
2016-06-01 22:32:35 -07:00
8bce6265fc
daemon: Rename copy to copyFunc
...
"copy" can be misleading for humans because Go has its own builtin "copy" function
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-02 13:30:20 +09:00
518709a87e
Fix the comment for daemon/logger.Copier
...
Now daemon/logger.Copier does not use ContainerID
Addendum to #23141
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-02 13:10:51 +09:00
a7f551359a
make pkg/parsers support darwin and solaris
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-02 11:47:27 +08:00
287b0a6348
Merge pull request #23141 from nalind/logger-remove-cid
...
Remove the logger.Message ContainerID field
2016-06-01 23:13:38 -04:00
7e5561a438
Merge pull request #23151 from AkihiroSuda/fix23012PkgAuth
...
Fix racy tests in pkg/authorization
2016-06-01 20:45:54 -04:00
273ab8591e
Merge pull request #22867 from justincormack/checklimits
...
Begin a section in the check-config script to check limits
2016-06-01 20:42:54 -04:00
db3351ae37
Removed exec permissions from Dockerfile.windows
...
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
2016-06-01 21:41:19 -03:00
f5df49b3dc
Add VMware Docker Volume Plugin.
...
Add reference to https://github.com/vmware/docker-volume-vsphere to Docker's list of plugins.
This is an officially supported plugin from VMware.
Signed-off-by: Ritesh H Shukla <sritesh@vmware.com>
2016-06-01 15:29:15 -07:00
2ca25302fe
Merge pull request #23120 from AkihiroSuda/fixStreamFormatter
...
Fix pkg/streamformatter.TestJSONFormatProgress
2016-06-01 14:37:35 -07:00
28676fc04b
Merge pull request #22769 from dnephin/integrate_cobra
...
Use spf13/cobra for the cli
2016-06-01 14:18:23 -07:00
cbccb19212
Merge pull request #23090 from yongtang/05292016-remove-deprecated-docker-tag-f
...
Remove deprecated -f flag on docker tag
2016-06-01 21:29:33 +02:00
b9676643c8
Update mailmap and re-generate Authors
...
Signed-off-by: Martin Redmond <redmond.martin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-01 20:19:46 +02:00
5e85ec82af
aufs,overlay: disable on eCryptfs
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-06-01 21:00:35 +03:00
cb36dddad1
Merge pull request #23148 from mlaventure/wait-for-containerd-before-restarting-it
...
Wait for containerd to die before restarting it
2016-06-01 10:35:31 -07:00
7b08941882
Update remote API docs for the removal of deprecated `force` in `docker tag`.
...
This fix updates remote API docs for the removal of deprecated `force` in `docker tag`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-01 09:45:10 -07:00
4455ec14b8
Remove deprecated -f flag on docker tag
...
The -f flag on docker tag has been deprecated in docker 1.10 and
is expected to be removed in docker 1.12.
This fix removed the -f flag on docker tag and also updated
deprecated.md.
NOTE: A separate pull request for engine-api has been opened to
cover the related changes.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-01 09:44:25 -07:00
1dab9af5d5
Vendor engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e
...
This fix updates engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e.
This fix is related to #23090 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-01 09:44:25 -07:00
4b86651053
Merge pull request #22570 from mountkin/rm-deprecated-feature
...
remove deprecated feature of passing HostConfig at API container start
2016-06-01 18:24:28 +02:00
09be7d9ee4
Merge pull request #23085 from icecrime/gitdm.config
...
Add gitdm configuration
2016-06-01 18:12:59 +02:00
8d75709f90
Merge pull request #23165 from thaJeztah/update-logging-code-hints
...
cleanup logging driver documentation
2016-06-01 17:55:24 +02:00
bcf0c8ca28
Merge pull request #23142 from Microsoft/ExtraCleanup
...
Windows: Remove a double free on hcs container handle
2016-06-01 11:09:06 -04:00
466eb1bab7
Merge pull request #23084 from estesp/ps-fastpath
...
Optimize `docker ps` when name/id filters in use
2016-06-01 16:52:35 +02:00
ce160b37e1
Wait for containerd to die before restarting it
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-01 07:45:03 -07:00
0a8386c8be
remove deprecated feature of passing HostConfig at API container start
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-06-01 22:25:17 +08:00
c7aba69cc1
Merge pull request #22989 from Microsoft/StartCleanup
...
Windows: Adding missing cleanup call when container start fails
2016-06-01 15:42:47 +02:00
1ba9aadbcb
Merge pull request #23072 from dnephin/set_state_dir_of_containerd
...
Set --state-dir on containerd
2016-06-01 14:56:32 +02:00
cdf61152bb
Merge pull request #23133 from runcom/graphtests-fix
...
graphtest: fix cleanup logic
2016-06-01 08:42:19 -04:00
74c7363965
Merge pull request #23143 from bfirsh/remove-status-column-from-clinet-libraries-page
...
Remove status column from client libraries page
2016-06-01 13:45:28 +02:00
a9f6d93099
cleanup logging driver documentation
...
This does a minor cleanup of the logging driver
documentation;
- Add a table-header to the driver-options
table.
- Add language hints to code-blocks to
prevent incorrect highlighting
- Wrap some code examples so that they
fit in the default layout
- Wrap text to 80-chars
- Fix ordering in menu
- Some minor rewording
We should still create separate pages
for all available drivers (for example,
json-file, syslog, and GELF don't have
their own configuration page)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-01 13:18:25 +02:00
3152a706c9
Add documentation for running multiple daemons
...
Signed-off-by: Lukasz Zajaczkowski <lukasz.zajaczkowski@ts.fujitsu.com>
2016-06-01 08:38:53 +02:00
f437e2d148
Fix racy tests in pkg/authorization
...
Fix #23012
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-01 03:25:56 +00:00
Alexander Morozov
Kenfe-Mickael Laventure
Vincent Demeester
Nalin Dahyabhai
Sebastiaan van Stijn
Dan Walsh
allencloud
Akihiro Suda
Lei Jitang
Senthil Kumaran
Brian Goff
Carlos Alexandro Becker
Ritesh H Shukla
Martin Redmond
unclejack
Yong Tang
Shijiang Wei
Sebastiaan van Stijn
Lukasz Zajaczkowski