98b281fb61
Windows: fix Windows graph driver name
...
Reverting "Windows filter storage driver" to "windowsfilter".
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: f182748b9b7d639c4db09f4f72411aba5f811f4e
Component: engine
2016-05-27 16:24:02 -07:00
2aa8db7718
Merge pull request #23067 from shishir-a412ed/fix_commit_issue
...
Fixes Issue # 22992: docker commit failing
Upstream-commit: b1f8b45b8ff7e7f3dda116fcde3067cc8fc0afb0
Component: engine
2016-05-27 15:06:29 -07:00
c18e25c7fa
Merge pull request #22716 from jmzwcn/issue22466-patches
...
Embedded DNS problem after renaming container. Step2:change in docker…
Upstream-commit: 4441a6c4c68f6ec7acb0e2d92d72274fbf403425
Component: engine
2016-05-27 23:27:42 +02:00
ea5d7217d0
Merge pull request #22621 from yongtang/05092016-remove-deprecated-command-line-short-variant-options
...
Un-deprecated command line short variant options of `-c`
Upstream-commit: 4a031f1f80440cc61b56e5b6e111e155e4da066d
Component: engine
2016-05-27 23:12:08 +02:00
b822217717
Merge pull request #22912 from duglin/FixImportTest
...
Fix docker import test
Upstream-commit: fd7ec4b9e58fe5ba4abab4f60b63552e11246f3c
Component: engine
2016-05-27 14:03:44 -07:00
561b16903d
Merge pull request #22438 from yongtang/22420-inconsistent-tmpfs-behavior
...
Inconsistent --tmpfs behavior
Upstream-commit: ec3ccde18bb2b46f9d2e74fad61e7286aa292123
Component: engine
2016-05-27 15:54:37 -04:00
aa60879053
Merge pull request #23060 from friism/add-power-shell-example
...
Add power shell example
Upstream-commit: 068d466cc7cd4ef3915b983b61e9cd029936ac90
Component: engine
2016-05-27 21:21:32 +02:00
57ccaf383c
Add powershell example and make linux build example consistent with other examples
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: ab391c9ab595f01e76b82edda0800e13655cc6f3
Component: engine
2016-05-27 11:49:09 -07:00
bd261166b3
Fixes Issue # 22992: docker commit failing.
...
1) docker create / run / start: this would create a snapshot device and mounts it onto the filesystem.
So the first time GET operation is called. it will create the rootfs directory and return the path to rootfs
2) Now when I do docker commit. It will call the GET operation second time. This time the refcount will check
that the count > 1 (count=2). so the rootfs already exists, it will just return the path to rootfs.
Earlier it was just returning the mp: /var/lib/docker/devicemapper/mnt/{ID} and hence the inconsistent paths error.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 09d0720e2fb6e30ee018887399f353f93ac2d421
Component: engine
2016-05-27 14:35:46 -04:00
148efb277e
Merge pull request #22376 from vdemeester/use-dockerd-in-integration-cli
...
Use dockerd instead of docker daemon in integration-cli
Upstream-commit: 01409bf069a4fbf8ebcbd27e2333a9d61d462138
Component: engine
2016-05-27 10:09:43 -07:00
8f272a4606
Merge pull request #23039 from yongtang/05262016-docs-cluster-store-opts
...
Fix error in dockerd.md for incorrect cluster-store-opts example.
Upstream-commit: f1276cd3aa8d2bff6e3ab1ac3a175deeecac405e
Component: engine
2016-05-27 18:55:48 +02:00
0c9b356dc5
Merge pull request #23030 from Microsoft/jjh/xenonworkdir
...
Windows: Default isolation and workdir
Upstream-commit: 1d87f788b1d544d388d599316f9999867c4c3c80
Component: engine
2016-05-27 11:31:36 -04:00
24d0cb8d62
Merge pull request #23032 from tonistiigi/walk-err-fix
...
Fix directory walker error checking
Upstream-commit: 6e721f6432da2fb6976b9c1cee41e15797cf6906
Component: engine
2016-05-27 11:20:45 -04:00
d2f37ef500
Merge pull request #22984 from Microsoft/jjh/ttymessage
...
Better error on attach no tty
Upstream-commit: 24d2ee8c485dc2a580ee57e3afc076dda307e3c8
Component: engine
2016-05-27 16:57:36 +02:00
0921f9fd2c
Merge pull request #23049 from vdemeester/search-validate-before-call
...
Validate filter values before calling registry.
Upstream-commit: ab9204c8264019f23587291ba03fc5ac71d215b9
Component: engine
2016-05-27 10:21:40 -04:00
9b06540d32
Merge pull request #22840 from runcom/go1.6
...
Upgrade to golang 1.6.2
Upstream-commit: 9b0d385975c80359b4cab2c75e4834fe803e12d5
Component: engine
2016-05-27 06:54:57 -07:00
d460ba90a2
Validate filter values before calling registry.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: cd012efa2e46ec82b7a1f742bfc6858513c4ee37
Component: engine
2016-05-27 11:13:12 +02:00
dca7370dee
Merge pull request #23035 from SvenDowideit/fix-links
...
Fix up stale links
Upstream-commit: bd5c9f59ea9dde983bf40b36f16311e550a5c2e4
Component: engine
2016-05-27 08:41:11 +02:00
815da186d3
Fix error in dockerd.md for incorrect cluster-store-opts example.
...
This fix fixes an error in documentation (dockerd.md). In the
example given by dockerd.md, the option `cluster-store-opts`
is assigned with an array but this option can only be assigned
as a map.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 32b234885e798650cdff70f0459175e79a294b4d
Component: engine
2016-05-26 20:04:48 -07:00
6d3d3f4514
Merge pull request #22993 from rhatdan/relabel
...
Multiple fixes for SELinux labels.
Upstream-commit: 3f6fa8af4522ba9b5ce2e4a52f959970ae4ccb8a
Component: engine
2016-05-26 22:51:17 -04:00
0e099055bb
Inconsistent --tmpfs behavior
...
This fix tries to address the issue raised in #22420 . When
`--tmpfs` is specified with `/tmp`, the default value is
`rw,nosuid,nodev,noexec,relatime,size=65536k`. When `--tmpfs`
is specified with `/tmp:rw`, then the value changed to
`rw,nosuid,nodev,noexec,relatime`.
The reason for such an inconsistency is because docker tries
to add `size=65536k` option only when user provides no option.
This fix tries to address this issue by always pre-progating
`size=65536k` along with `rw,nosuid,nodev,noexec,relatime`.
If user provides a different value (e.g., `size=8192k`), it
will override the `size=65536k` anyway since the combined
options will be parsed and merged to remove any duplicates.
Additional test cases have been added to cover the changes
in this fix.
This fix fixes #22420 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 397a6fefadf9ac91a5c9de2447f4dea607296470
Component: engine
2016-05-26 19:28:18 -07:00
8607e03463
Fix up stale links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ee7696312580f14ce7b8fe70e9e4cbdc9f83919f
Component: engine
2016-05-27 00:28:46 +00:00
e9a370108d
Fix directory walker error checking
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 81d24e754d48ac8e9f0e4fe02befbf628179da43
Component: engine
2016-05-26 14:59:38 -07:00
d77d575d98
Merge pull request #22888 from ibuildthecloud/host-compat
...
Remove DOCKER_HTTP_HOST_COMPAT env var
Upstream-commit: ef89891855e132d3d0e4c92fa041f590c8e8198c
Component: engine
2016-05-26 14:41:22 -07:00
386cba6ed8
Merge pull request #23009 from Microsoft/WindowsLeakedHandle
...
Fix a leaked process handle of the first container to start on Windows
Upstream-commit: 11ddfa4b2b0ad1b08eb602250210a6b9d200cc58
Component: engine
2016-05-26 14:39:57 -07:00
593ac9fc18
Merge pull request #22918 from tonistiigi/image-delete-deadlock
...
Release memoryStore locks before filter/apply
Upstream-commit: 67767dba6c815764dd7a0cb81b75ba096bf0dd0a
Component: engine
2016-05-26 16:00:39 -05:00
a658ae4b8f
Windows: Default isolation and workdir
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6952135fc8004f669c962c5989fd2e5a05bb2510
Component: engine
2016-05-26 13:24:22 -07:00
5bcb28804b
Merge pull request #22268 from Microsoft/jjh/continuationescape
...
Support platform semantic file paths through ESCAPE
Upstream-commit: 8e924153e219d040e3aa672df4e0c7baff9f8d8b
Component: engine
2016-05-26 10:00:56 -07:00
2e3f90f2fd
Un-deprecated command line short variant options of -c.
...
Since 1.9, the following short variant options have been
deprecated in favor of their long variants:
`docker run -c (--cpu-shares)`
`docker build -c (--cpu-shares)`
`docker create -c (--cpu-shares)`
`docker update -c (--cpu-shares)`
However, `-c` is still widely used and is considered as
a convenient option for swarm (see #16271 ).
This fix undeprecated the command line short
variant options of `-c` and updated the deprecated.md.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: fea7acf0e9f0532af7451a3c3835a0cfabf4fb20
Component: engine
2016-05-26 08:22:27 -07:00
7d26b2d050
Merge pull request #22976 from vdemeester/22091-condition-followup
...
Invert CgroupDevicesEnabled condition
Upstream-commit: 56359cccbc9634c3cb37b1e9eb53160b6a4ffe38
Component: engine
2016-05-26 15:42:42 +02:00
06a16bdf54
Merge pull request #22999 from deed02392/master
...
Update debian.md
Upstream-commit: 215324251aed0df84d0a5a876ccd5a7e537a41a1
Component: engine
2016-05-26 15:37:55 +02:00
0c3fa0e2e7
Update debian.md
...
Updated documents markdown file on Debian installation.
Added details on the fact that backports are necessary on Wheezy as discussed in issue #16878
Signed-off-by: George Hafiz <george@hafiz.uk >
Upstream-commit: 6c5f724560d3e1c47c927fa39056cd32de9f0890
Component: engine
2016-05-26 13:47:19 +01:00
f69eee1876
Merge pull request #22474 from allencloud/make-pkg-platform-support-darwin
...
add architecture_darwin.go in package docker/pkg/platform to support darwin
Upstream-commit: e9011956342ce77a4d1d28f200816d188f804b1e
Component: engine
2016-05-26 14:05:43 +02:00
f408291a41
Use dockerd instead of docker daemon in integration-cli
...
Updating `integration-cli/daemon.go` to use `dockerd` instead of `docker
daemon` to start up the daemon.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f87053b9c387a5a577383c758dc901cb8bf539e2
Component: engine
2016-05-26 13:14:35 +02:00
b44b316db0
Invert CgroupDevicesEnabled condition
...
It feels better to test where it's required than listing everywhere it
is not required.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 72fefc0441d57b59f27bebdb144e0e35c0c63a0d
Component: engine
2016-05-26 13:09:11 +02:00
6e20543be2
Merge pull request #22861 from vdemeester/daemon-images-search-refactoring
...
Daemon images search refactoring
Upstream-commit: 75109b32db4c23f469b57fb99300fc5d4a689dce
Component: engine
2016-05-26 12:34:31 +02:00
b0be4b2524
Merge pull request #22997 from aboch/ports
...
Update port info on network connect/disconnect
Upstream-commit: ecdf75dca64eed7cc599b6d8fedf9303ae44d0f4
Component: engine
2016-05-26 12:18:00 +02:00
381674582f
Merge pull request #22991 from justincormack/seccompchown
...
Do not restrict chown via seccomp, just let capabilities control access
Upstream-commit: 214ab225828eda4ccbbf031350a013425985eeac
Component: engine
2016-05-26 11:19:10 +02:00
898abb33e0
Embedded DNS problem after renaming container. Step2:change in docker/daemon side and add integration test
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: be072a89544300a484970fd95207bdb93c5c7d9e
Component: engine
2016-05-26 12:59:44 +08:00
c9cc850112
Fix a leaked process handle of the first container to start on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 717209c9ffc5caa4782dfda39e7be9a7b581a42c
Component: engine
2016-05-25 21:33:50 -07:00
a3e048ef64
make package docker/pkg/platform support darwin
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: e18296f4f06595c4becc90bf6db4f3d2b8a625c5
Component: engine
2016-05-26 11:10:29 +08:00
385c7ab306
Merge pull request #23000 from jstarks/use_image_version_for_console_check
...
Windows: Use image version, not OS version for TTY fixup
Upstream-commit: 089166ebe29c1801483965b0e30b41fda53b1ec2
Component: engine
2016-05-25 17:40:56 -07:00
611bbe573a
Update port info on network connect/disconnect
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: f198dfd856ca6125ef50b11d9d698550d66c9d4e
Component: engine
2016-05-25 17:02:50 -07:00
2b4f5fa2df
Merge pull request #22951 from Microsoft/jjh/ise2
...
Windows: run -it not crash in PowerShell ISE
Upstream-commit: e010610828456fcb9ccce46723894c4dff238daf
Component: engine
2016-05-25 16:50:06 -07:00
5a770ee4b3
Merge pull request #23001 from Djelibeybi/fix-oracle-docs
...
Fix URLs for official Oracle installation guide.
Upstream-commit: 8863d6dc5fdfaf1db5930b644eb5c271dd5a162a
Component: engine
2016-05-25 23:59:31 +02:00
ce0de1f301
Fix URLs for official Oracle installation guide.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: 7711c842be52cd753c13a50594da301f2158ddae
Component: engine
2016-05-26 07:40:01 +10:00
3d881fdab6
Merge pull request #22996 from thaJeztah/update-hub-pricing-link
...
update link to hub plans
Upstream-commit: 64c444b109821fc0c6af139828140df0265729e8
Component: engine
2016-05-25 23:23:48 +02:00
0dfa27aea9
update link to hub plans
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3d782cdbffd4b8bddbc8f63e3a0b762224a5d3c3
Component: engine
2016-05-25 23:01:13 +02:00
5a1641d4f8
Merge pull request #22956 from Microsoft/jjh/nonttylogin
...
Fix bad error doing docker login in from non TTY
Upstream-commit: ff3dc489668ca634e48f4e0a971bfd23e80699ff
Component: engine
2016-05-25 16:45:48 -04:00
b1b78eb8c6
Merge pull request #22949 from vdemeester/move-daemon-container-horn
...
Move some container related methods and structs to smaller files
Upstream-commit: d9db8960fda02769264ce0b553adf2b427c1c48a
Component: engine
2016-05-25 13:42:07 -07:00
