cb8e7470be
Merge pull request #23208 from vdemeester/update-engine-api
...
Bump engine api to 009ba16
2016-06-02 09:30:57 -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
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
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
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
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
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
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
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
41232e4b36
Merge pull request #23145 from crosbymichael/clang
...
Use clang 3.5 over 3.8
2016-05-31 19:18:02 -07:00
f8dacaf0ab
Use clang 3.5 over 3.8
...
the llvm apt repo was removed and finding the exact rev of the llvm
toolchain that worked perfecting in our dockerfile is a problem.
We looked at the reasons why we were using this version of clang and it
appears to be this compiler warning.
`was built for newer OSX version (10.11) than being linked
(10.6)`
When you look at the dockerfile this makes sense.
```
ENV OSX_SDK MacOSX10.11.sdk
ENV OSX_CROSS_COMMIT 8aa9b71a394905e6c5f4b59e2b97b87a004658a4
RUN set -x \
&& export OSXCROSS_PATH="/osxcross" \
&& git clone https://github.com/tpoechtrager/osxcross.git $OSXCROSS_PATH \
&& ( cd $OSXCROSS_PATH && git checkout -q $OSX_CROSS_COMMIT) \
&& curl -sSL https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz -o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" \
&& UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh
ENV PATH /osxcross/target/bin:$PATH
```
We are basically using the 10.11 sdk but linking to 10.6 as the
min version so this warning should be expected.
Also the docs on the osxcross project require clan 3.2+, not 3.8.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-31 16:45:42 -07:00
896fbb470a
Remove status column from client libraries page
...
They are all "active". If they are not active, we should probably
remove them.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-05-31 16:12:14 -07:00
2fea5b6e28
Update client libraries introduction text
...
Explain what they actually are.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-05-31 16:11:36 -07:00
9b2bb64a38
Make the -h flag deprecated.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 15:43:16 -07:00
fc5a4514fb
Use Args in cobra.Command to validate args.
...
Also re-use context.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 15:43:16 -07:00
54b5cce7e4
Support usage messages on bad flags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 15:43:16 -07:00
3d624ed5d6
Update cobra vendor
...
- adds support for usage strings on flag errors
- adds support for arg validation
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 15:43:13 -07:00
667dcb0e8e
Update usage and help to (almost) match the existing docker behaviour
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 14:41:37 -07:00
Alexander Morozov
Vincent Demeester
Sebastiaan van Stijn
Akihiro Suda
Lei Jitang
Brian Goff
Carlos Alexandro Becker
Ritesh H Shukla
unclejack
Yong Tang
Kenfe-Mickael Laventure
Shijiang Wei
Sebastiaan van Stijn
Tõnis Tiigi
Michael Crosby
Ben Firshman
Daniel Nephin