1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

24521 commits

Author SHA1 Message Date
allencloud
c1be45fa38 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-02 17:17:22 +08:00
Brian Goff
287b0a6348 Merge pull request from nalind/logger-remove-cid
Remove the logger.Message ContainerID field
2016-06-01 23:13:38 -04:00
Brian Goff
7e5561a438 Merge pull request from AkihiroSuda/fix23012PkgAuth
Fix racy tests in pkg/authorization
2016-06-01 20:45:54 -04:00
Brian Goff
273ab8591e Merge pull request from justincormack/checklimits
Begin a section in the check-config script to check limits
2016-06-01 20:42:54 -04:00
Alexander Morozov
2ca25302fe Merge pull request from AkihiroSuda/fixStreamFormatter
Fix pkg/streamformatter.TestJSONFormatProgress
2016-06-01 14:37:35 -07:00
Alexander Morozov
28676fc04b Merge pull request from dnephin/integrate_cobra
Use spf13/cobra for the cli
2016-06-01 14:18:23 -07:00
Vincent Demeester
cbccb19212 Merge pull request from yongtang/05292016-remove-deprecated-docker-tag-f
Remove deprecated -f flag on docker tag
2016-06-01 21:29:33 +02:00
Alexander Morozov
cb36dddad1 Merge pull request from mlaventure/wait-for-containerd-before-restarting-it
Wait for containerd to die before restarting it
2016-06-01 10:35:31 -07:00
Yong Tang
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
Yong Tang
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
Yong Tang
1dab9af5d5 Vendor engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e
This fix updates engine-api to 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e.

This fix is related to .

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-01 09:44:25 -07:00
Vincent Demeester
4b86651053 Merge pull request from mountkin/rm-deprecated-feature
remove deprecated feature of passing HostConfig at API container start
2016-06-01 18:24:28 +02:00
Vincent Demeester
09be7d9ee4 Merge pull request from icecrime/gitdm.config
Add gitdm configuration
2016-06-01 18:12:59 +02:00
Sebastiaan van Stijn
8d75709f90 Merge pull request from thaJeztah/update-logging-code-hints
cleanup logging driver documentation
2016-06-01 17:55:24 +02:00
Brian Goff
bcf0c8ca28 Merge pull request from Microsoft/ExtraCleanup
Windows: Remove a double free on hcs container handle
2016-06-01 11:09:06 -04:00
Vincent Demeester
466eb1bab7 Merge pull request from estesp/ps-fastpath
Optimize `docker ps` when name/id filters in use
2016-06-01 16:52:35 +02:00
Kenfe-Mickael Laventure
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
Shijiang Wei
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
Vincent Demeester
c7aba69cc1 Merge pull request from Microsoft/StartCleanup
Windows: Adding missing cleanup call when container start fails
2016-06-01 15:42:47 +02:00
Sebastiaan van Stijn
1ba9aadbcb Merge pull request from dnephin/set_state_dir_of_containerd
Set --state-dir on containerd
2016-06-01 14:56:32 +02:00
Brian Goff
cdf61152bb Merge pull request from runcom/graphtests-fix
graphtest: fix cleanup logic
2016-06-01 08:42:19 -04:00
Vincent Demeester
74c7363965 Merge pull request from bfirsh/remove-status-column-from-clinet-libraries-page
Remove status column from client libraries page
2016-06-01 13:45:28 +02:00
Sebastiaan van Stijn
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
Akihiro Suda
f437e2d148 Fix racy tests in pkg/authorization
Fix 

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-01 03:25:56 +00:00
Tõnis Tiigi
41232e4b36 Merge pull request from crosbymichael/clang
Use clang 3.5 over 3.8
2016-05-31 19:18:02 -07:00
Michael Crosby
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
Ben Firshman
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
Ben Firshman
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
Daniel Nephin
9b2bb64a38 Make the -h flag deprecated.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 15:43:16 -07:00
Daniel Nephin
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
Daniel Nephin
54b5cce7e4 Support usage messages on bad flags.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 15:43:16 -07:00
Daniel Nephin
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
Daniel Nephin
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
Daniel Nephin
69264beb40 Migrate volume commands to cobra.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 14:41:37 -07:00
Daniel Nephin
6bc3e23f65 Refactor cli inspector to support new inspects.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 14:41:37 -07:00
Daniel Nephin
8c77c73e7b Vendor spf13/cobra and spf13/pflag
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 14:41:37 -07:00
Nalin Dahyabhai
7772d270c0 Remove the logger.Message ContainerID field
Log drivers are instantiated on a per-container basis, and passed the
container ID (along with other information) when they're initialized.
Drivers that care about that value are caching the value that they're
passed when they're initialized and using it in favor of the value
contained in Message structures that are passed to them, so the field in
Messages is unused, so we remove it.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-05-31 16:41:29 -04:00
Vincent Demeester
4a7715c978 Merge pull request from justincormack/seccomperror
Error out if user tries to specify a custom seccomp profile on system that does not support it
2016-05-31 22:40:58 +02:00
Daniel Nephin
8b5e5c6195 Set --state-dir on containerd.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-31 11:48:05 -07:00
Antonio Murdaca
b18062122d graphtest: fix cleanup logic
device Base should not exists on failure:

--- FAIL: TestDevmapperCreateBase (0.06s)
    graphtest_unix.go:122: stat
/tmp/docker-graphtest-079240530/devicemapper/mnt/Base/rootfs/a subdir:
no such file or directory
--- FAIL: TestDevmapperCreateSnap (0.00s)
    graphtest_unix.go:219: devmapper: device Base already
exists.

it should be:

--- FAIL: TestDevmapperCreateBase (0.25s)
	graphtest_unix.go:122: stat
/tmp/docker-graphtest-828994195/devicemapper/mnt/Base/rootfs/a subdir:
no such file or directory
--- FAIL: TestDevmapperCreateSnap (0.13s)
	graphtest_unix.go:122: stat
/tmp/docker-graphtest-828994195/devicemapper/mnt/Snap/rootfs/a subdir:
no such file or directory

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-31 20:08:57 +02:00
Darren Stahl
c8454394f7 Windows: Remove a double free on hcs container handle
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-05-31 10:25:38 -07:00
Darren Stahl
054992e291 Windows: Adding missing cleanup call when container start fails
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-05-31 10:19:05 -07:00
Justin Cormack
6bd797b43f Error out if user tries to specify a custom seccomp profile on system that does not support it
Fixes 

If a profile is explicitly passed but the system is not built with seccomp support,
error out rather than just running without a profile at all as we would previously.
Behaviour is unchanged if no profile is specified or unconfined is specified.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-05-31 17:52:40 +01:00
Alexander Morozov
0b5e84cc8d Merge pull request from mountkin/fix-23045
fix flaky test TestImportFileWithMessage
2016-05-31 09:39:38 -07:00
Alexander Morozov
d1e9e86122 Merge pull request from michael-holzheu/s390x-dockerfile-gcc-6.1
Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1)
2016-05-31 09:14:41 -07:00
Akihiro Suda
da7edb5f3c Fix pkg/streamformatter.TestJSONFormatProgress
The test was failing if the terminal column width is <= 110.

Addendum to 

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-31 09:09:06 +00:00
Michael Holzheu
b5490d4897 Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1)
Pull request  and commit 40b21745cc ("Upgrade to golang 1.6.2")
introduces gcc 6.1 for Dockerfile.gccgo and Dockerfile.ppc64le.
So do this also for s390x and use "s390x/gcc:6.1" as base image.

In addition to this use "GO15VENDOREXPERIMENT=0" for notary build
as a workaround for:

 * 
 * 

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-05-31 04:39:20 -04:00
Lei Jitang
ba372df79c Merge pull request from AkihiroSuda/fixTIOCGWINSZ23112
Fix pkg/jsonmessage.TestProgress panic
2016-05-31 14:58:55 +08:00
Alexander Morozov
a1f1e9c6d9 Merge pull request from AkihiroSuda/fixPkgDirectoryFilepathWalk
Fix filepath.Walk misusage in pkg/directory
2016-05-30 22:18:56 -07:00
Akihiro Suda
709478c8a3 Fix pkg/jsonmessage.TestProgress panic
Fix 

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-31 04:19:00 +00:00