Commit Graph

24527 Commits

Author SHA1 Message Date
ab8e2e8aee 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>
Upstream-commit: 322cc99c6962ecb56be3107061eb7f61364d05f8
Component: engine
2016-06-02 07:14:17 -04:00
ce5b5efc4f Merge pull request #23121 from unclejack/disallow_ecryptfs_aufs
aufs,overlay: disable on eCryptfs
Upstream-commit: 22aca92ee3503f811f813be4a1349ad8e67fbbdb
Component: engine
2016-06-02 12:54:43 +02:00
3791819a91 Merge pull request #23190 from AkihiroSuda/addendum23141
Fix the comment for daemon/logger.Copier
Upstream-commit: 69545fe19d294d5ff4c43c2adc2795935f14ae61
Component: engine
2016-06-02 12:21:52 +02:00
b6b45310b0 Merge pull request #23197 from coolljt0725/cleanup_comment
cleanup: clean up commented code in daemon/stats.go
Upstream-commit: b02acfcbe045aa1d53acc8941bb8cd826ffce9cc
Component: engine
2016-06-02 10:12:10 +02:00
89431d14b9 cleanup: clean up commented code in daemon/stats.go
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2d9c02294683e78f9165585a134b090ed47d9bff
Component: engine
2016-06-02 14:39:12 +08:00
0593e6d766 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>
Upstream-commit: 518709a87e04f55babc5162861aa4ba9a423f0c8
Component: engine
2016-06-02 13:10:51 +09:00
c944984315 Merge pull request #23141 from nalind/logger-remove-cid
Remove the logger.Message ContainerID field
Upstream-commit: 287b0a6348d8f768db6ff840feedcb32a4c2d448
Component: engine
2016-06-01 23:13:38 -04:00
86a406432b Merge pull request #23151 from AkihiroSuda/fix23012PkgAuth
Fix racy tests in pkg/authorization
Upstream-commit: 7e5561a438bebd8bd2096231e3d2848b016a162b
Component: engine
2016-06-01 20:45:54 -04:00
f88c951e19 Merge pull request #22867 from justincormack/checklimits
Begin a section in the check-config script to check limits
Upstream-commit: 273ab8591e5aaca6767c1a5ce4b66ed53897a51e
Component: engine
2016-06-01 20:42:54 -04:00
31e766e68c Merge pull request #23120 from AkihiroSuda/fixStreamFormatter
Fix pkg/streamformatter.TestJSONFormatProgress
Upstream-commit: 2ca25302fe7033ab0129554bb679294aa04db70b
Component: engine
2016-06-01 14:37:35 -07:00
e0398fafd2 Merge pull request #22769 from dnephin/integrate_cobra
Use spf13/cobra for the cli
Upstream-commit: 28676fc04b9a307718b66bd28e8d9281d05f38ac
Component: engine
2016-06-01 14:18:23 -07:00
0f5d306d0d Merge pull request #23090 from yongtang/05292016-remove-deprecated-docker-tag-f
Remove deprecated -f flag on docker tag
Upstream-commit: cbccb19212c186e5baf5e09b130a7fcc1d58df4c
Component: engine
2016-06-01 21:29:33 +02:00
e85968bd52 aufs,overlay: disable on eCryptfs
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 5e85ec82af6c8ec70ed39fd8489aea730fd41561
Component: engine
2016-06-01 21:00:35 +03:00
3cbc347e63 Merge pull request #23148 from mlaventure/wait-for-containerd-before-restarting-it
Wait for containerd to die before restarting it
Upstream-commit: cb36dddad150a3bc0986736a877c8bdfcfbd346c
Component: engine
2016-06-01 10:35:31 -07:00
0739417adc 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>
Upstream-commit: 7b08941882668c1c40adb03d9227d22e0aa5e605
Component: engine
2016-06-01 09:45:10 -07:00
5dcdbc4a5a 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>
Upstream-commit: 4455ec14b87d5ad474c5e11d60907bceb35e9e09
Component: engine
2016-06-01 09:44:25 -07:00
2d116f099f 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>
Upstream-commit: 1dab9af5d5acc1fe3a1bfb84a5cc576d664095e4
Component: engine
2016-06-01 09:44:25 -07:00
499b99fb58 Merge pull request #22570 from mountkin/rm-deprecated-feature
remove deprecated feature of passing HostConfig at API container start
Upstream-commit: 4b86651053d92429ee2a73abd2d815a5d4c936a1
Component: engine
2016-06-01 18:24:28 +02:00
357ff8123d Merge pull request #23085 from icecrime/gitdm.config
Add gitdm configuration
Upstream-commit: 09be7d9ee4533c0b60c0c2b70d0cde41a86e5049
Component: engine
2016-06-01 18:12:59 +02:00
5934bb4c2f Merge pull request #23165 from thaJeztah/update-logging-code-hints
cleanup logging driver documentation
Upstream-commit: 8d75709f90ba9926d41cd7b91bb316e336af8f8c
Component: engine
2016-06-01 17:55:24 +02:00
e66ae89f7b Merge pull request #23142 from Microsoft/ExtraCleanup
Windows: Remove a double free on hcs container handle
Upstream-commit: bcf0c8ca2883867ba7dcec4824a64359ee7cab12
Component: engine
2016-06-01 11:09:06 -04:00
f05fdb403b Merge pull request #23084 from estesp/ps-fastpath
Optimize `docker ps` when name/id filters in use
Upstream-commit: 466eb1bab702f7afd652e57f6041124d5399fbd4
Component: engine
2016-06-01 16:52:35 +02:00
a612268e81 Wait for containerd to die before restarting it
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: ce160b37e15ddb86c45314d080718f833e551aa3
Component: engine
2016-06-01 07:45:03 -07:00
67d0b2dc23 remove deprecated feature of passing HostConfig at API container start
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 0a8386c8be3fa87b7523bef7fd31c81a7f84709c
Component: engine
2016-06-01 22:25:17 +08:00
9c661aedc4 Merge pull request #22989 from Microsoft/StartCleanup
Windows: Adding missing cleanup call when container start fails
Upstream-commit: c7aba69cc10faee84ba877ad4a94e4e150cb0932
Component: engine
2016-06-01 15:42:47 +02:00
ef3d1ff998 Merge pull request #23072 from dnephin/set_state_dir_of_containerd
Set --state-dir on containerd
Upstream-commit: 1ba9aadbcb8444e4dd70cd83f0d14d7f3c694f10
Component: engine
2016-06-01 14:56:32 +02:00
f27714bc80 Merge pull request #23133 from runcom/graphtests-fix
graphtest: fix cleanup logic
Upstream-commit: cdf61152bb58f6d10217434c1f976fcdea15110e
Component: engine
2016-06-01 08:42:19 -04:00
dd16c85f55 Merge pull request #23143 from bfirsh/remove-status-column-from-clinet-libraries-page
Remove status column from client libraries page
Upstream-commit: 74c7363965625848c32a5af80526fb65ecb26064
Component: engine
2016-06-01 13:45:28 +02:00
46e46eb95e 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>
Upstream-commit: a9f6d93099283ee06681caae7fe29bd1b2dd4c77
Component: engine
2016-06-01 13:18:25 +02:00
ec0b8580b4 Fix racy tests in pkg/authorization
Fix #23012

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: f437e2d1485bfb64ac0ecc85ac3b14975e9f51f6
Component: engine
2016-06-01 03:25:56 +00:00
62fbe9a76e Merge pull request #23145 from crosbymichael/clang
Use clang 3.5 over 3.8
Upstream-commit: 41232e4b360aca1e041aa7dbbe33af69efce6ca6
Component: engine
2016-05-31 19:18:02 -07:00
b2b61a70f2 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>
Upstream-commit: f8dacaf0ab7ca533cc3a33c6d06f7dca3e347955
Component: engine
2016-05-31 16:45:42 -07:00
33dcac83e5 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>
Upstream-commit: 896fbb470a5fa118039ccbd30c3bffdcc6c461ff
Component: engine
2016-05-31 16:12:14 -07:00
898770c3b7 Update client libraries introduction text
Explain what they actually are.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 2fea5b6e28c6b92ee2e453ad1855d17246d6e08e
Component: engine
2016-05-31 16:11:36 -07:00
7115ea3c86 Make the -h flag deprecated.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9b2bb64a3800619b5810e8baf59d72613e7ccd19
Component: engine
2016-05-31 15:43:16 -07:00
93473dcef1 Use Args in cobra.Command to validate args.
Also re-use context.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fc5a4514fbe1b402d2a0bff170486ac3de4bf8cc
Component: engine
2016-05-31 15:43:16 -07:00
354491fd5d Support usage messages on bad flags.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 54b5cce7e467a2b4fff76f95d465544f7be5b666
Component: engine
2016-05-31 15:43:16 -07:00
8b7b615274 Update cobra vendor
- adds support for usage strings on flag errors
- adds support for arg validation

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3d624ed5d6c6bc8d4cbc6fdf579bd066c2f45e12
Component: engine
2016-05-31 15:43:13 -07:00
041d2192d1 Update usage and help to (almost) match the existing docker behaviour
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 667dcb0e8e550d1a80ee67c6d71979e8cfabea1f
Component: engine
2016-05-31 14:41:37 -07:00
fdda20f059 Migrate volume commands to cobra.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 69264beb4093c56e8c5b256a70e1a0150294c81c
Component: engine
2016-05-31 14:41:37 -07:00
d225e1ee11 Refactor cli inspector to support new inspects.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6bc3e23f656f111bf72c52ebe67fa9bd7c9ab37b
Component: engine
2016-05-31 14:41:37 -07:00
e1ba5cfcf6 Vendor spf13/cobra and spf13/pflag
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8c77c73e7b43a6a01133227e93c1e3f25d8a6e70
Component: engine
2016-05-31 14:41:37 -07:00
dc1c41cd47 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>
Upstream-commit: 7772d270c06cc6c26359b556c95563bae31c1038
Component: engine
2016-05-31 16:41:29 -04:00
3d90736ff8 Merge pull request #23130 from justincormack/seccomperror
Error out if user tries to specify a custom seccomp profile on system that does not support it
Upstream-commit: 4a7715c9783627ecc194dac8502a684f40a9d0bd
Component: engine
2016-05-31 22:40:58 +02:00
b9c6d22ba9 Set --state-dir on containerd.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8b5e5c61955eba9af7c2975b959c4f4517485389
Component: engine
2016-05-31 11:48:05 -07:00
2360dea0b4 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>
Upstream-commit: b18062122d76a9f53822889874aa12103d491372
Component: engine
2016-05-31 20:08:57 +02:00
1ed90a29aa Windows: Remove a double free on hcs container handle
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: c8454394f76865777d4cd013c606d17dcd0f9600
Component: engine
2016-05-31 10:25:38 -07:00
7a3282f5c8 Windows: Adding missing cleanup call when container start fails
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 054992e2913cf10171eecb5f41e5c19158cf04bc
Component: engine
2016-05-31 10:19:05 -07:00
86035f6061 Error out if user tries to specify a custom seccomp profile on system that does not support it
Fixes #23031

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>
Upstream-commit: 6bd797b43fa738efc7eed02e96c21b352aa1c25b
Component: engine
2016-05-31 17:52:40 +01:00
5742c6afc6 Merge pull request #23046 from mountkin/fix-23045
fix flaky test TestImportFileWithMessage
Upstream-commit: 0b5e84cc8d190520e55a80530d29c455805974af
Component: engine
2016-05-31 09:39:38 -07:00