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
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
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
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
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
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
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
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
aa760bc9d4
Multiple fixes for SELinux labels.
...
SELinux labeling should be disabled when using --privileged mode
/etc/hosts, /etc/resolv.conf, /etc/hostname should not be relabeled if they
are volume mounted into the container.
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: c3dd6074b0f07cd7e57d677cc06b4c57a302a02f
Component: engine
2016-05-25 16:11:02 -04:00
2e38fa40d5
Merge pull request #22985 from samuelkarp/awslogs-logging-driver
...
awslogs: Fix a race in mockcwlogsclient
Upstream-commit: dca92044beaada248c4bab07c1bb9d38be1cf5aa
Component: engine
2016-05-25 13:08:00 -07:00
f18e4825e1
Do not restrict chown via seccomp, just let capabilities control access
...
In #22554 I aligned seccomp and capabilities, however the case of
the chown calls and CAP_CHOWN was less clearcut, as these are
simple calls that the capabilities will block if they are not
allowed. They are needed when no new privileges is not set in
order to allow docker to call chown before the container is
started, so there was a workaround but this did not include
all the chown syscalls, and Arm was failing on some seccomp
tests because it was using a different syscall from just the
fchown that was allowed in this case. It is simpler to just
allow all the chown calls in the default seccomp profile and
let the capabilities subsystem block them.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 9ed6e39cdd7acf488d5ff2a6876793837687e4cf
Component: engine
2016-05-25 12:49:30 -07:00
37e80ffc41
Windows: Use image version, not OS version for TTY fixup
...
A previous change added a TTY fixup for stdin on older Windows versions to
work around a Windows issue with backspace/delete behavior. This change
used the OS version to determine whether to activate the behavior.
However, the Windows bug is actually in the image, not the OS, so it
should have used the image's OS version.
This ensures that a Server TP5 container running on Windows 10 will have
reasonable console behavior.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 6508c015fe764fd59438cabffcbc6102c9cf04ef
Component: engine
2016-05-25 12:22:52 -07:00
9d83880bc6
Merge pull request #22986 from SvenDowideit/add-make-test
...
Add make test and other small cleanups
Upstream-commit: 4746864c2b405bcb2526df20d572b9de9df7f3b1
Component: engine
2016-05-25 21:03:59 +02:00
5eadce41df
Merge pull request #22987 from Microsoft/jjh/labeldocs
...
Docs: Label clarification
Upstream-commit: bb80563a8123824bed23c36698e6fa01317bbe5f
Component: engine
2016-05-25 20:56:54 +02:00
8c21a32e0f
awslogs: Fix a race in mockcwlogsclient
...
Signed-off-by: Samuel Karp <skarp@amazon.com >
Upstream-commit: c1ad02ccc8791b3c517aa37223d27792863cbf17
Component: engine
2016-05-25 11:50:22 -07:00
6679d6d042
Merge pull request #22661 from SvenDowideit/update-compatibility-matrix
...
docs: update graphdriver compatibility matrix
Upstream-commit: a5e4aaaf71cad9e4f57b50d92297d74c515b6c6d
Component: engine
2016-05-25 20:48:39 +02:00
1031d8bb5e
Docs: Label clarification
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b2643b6953e59549eba8af51a7e783a3e4cebc46
Component: engine
2016-05-25 11:48:07 -07:00
7098114aac
docs: update graphdriver compatibility matrix
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: a7bf4e4832c216bdbc9fc678262bcd2c081e914b
Component: engine
2016-05-25 18:33:45 +00:00
abd6ce8179
Add make test and other small cleanups
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ad538f6465776281550a7e40b59d5eb6f706b777
Component: engine
2016-05-25 18:30:01 +00:00
0635a7e10b
Merge pull request #22908 from vdemeester/7967-since-before-image-filters
...
Add before and since filter to images
Upstream-commit: 0fe4417a3b2c18714303f319224b74ec08674115
Component: engine
2016-05-25 20:15:23 +02:00
e94aa3f2ac
Merge pull request #22943 from vdemeester/21769-fix-detach-keys
...
Fix escape-keys by preserving input if invalid
Upstream-commit: 60abc96acfeae1985f4f0e9e9b44376b75a235f0
Component: engine
2016-05-25 09:53:53 -07:00
ac5e68234e
Merge pull request #22916 from duglin/FixNetTest
...
Fix flaky TestApiStatsNetworkStats test
Upstream-commit: 004ce6b57124c1a99348e1447ac9e00a970d1b34
Component: engine
2016-05-25 18:51:47 +02:00
3f005ffe52
Windows: run -it not crash in ISE
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 486a1a03d86a679740d79c2ef5e2a9574342f8c3
Component: engine
2016-05-25 09:50:18 -07:00
5773cc71d1
Error login from non TTY
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 541fba13fcbef5e082e3ce08a14901edce4697b6
Component: engine
2016-05-25 09:29:50 -07:00
ecdb255cd3
Merge pull request #22958 from Microsoft/hcs_rpc
...
Windows: Use the new HCS RPC API
Upstream-commit: c7ee50308290d56b70933dfd83bd70e3a9df93d5
Component: engine
2016-05-25 09:25:22 -07:00
504a2ff9e3
Merge pull request #22953 from Microsoft/jjh/TestRunWorkingDirectory
...
Windows: Fix TestRunWorkingDirectory
Upstream-commit: 8c70ab803c49816de8124703db6635e9c5c7ce25
Component: engine
2016-05-25 17:54:39 +02:00
558c1d058e
Merge pull request #22973 from AkihiroSuda/fix22965IntegrationRace
...
Fix a race in pkg/integration.TestChannelBufferTimeout
Upstream-commit: 53e2deb1590c8d0b6bf7c700c630dc432ea772d4
Component: engine
2016-05-25 11:35:23 -04:00
6eea85e6f1
Merge pull request #22960 from justincormack/seccompdefnotarm
...
Do not run the seccomp tests that use default.json on non x86 architectures
Upstream-commit: 4d376e9cc265c098c7faf03d0e75c1164cbf24e0
Component: engine
2016-05-25 17:20:16 +02:00
ddcc4a0981
Merge pull request #22969 from AkihiroSuda/fix22963LogRace
...
Fix a race in daemon/logger.TestCopier
Upstream-commit: a41e823c1bcbaafca1081dd23a7af3fa25ac946f
Component: engine
2016-05-25 11:09:51 -04:00
38a1e359da
Merge pull request #22966 from AkihiroSuda/fix22964MemRace
...
Fix a race in pkg/discovery/memory
Upstream-commit: cef4ea0b9759386800aae27d6fa92c80d4465745
Component: engine
2016-05-25 10:58:31 -04:00
e0c1ae90e0
Merge pull request #22968 from mbentley/fix-dm-docs
...
Fixed lost thin pool devicemapper docs
Upstream-commit: 5bd6067b85cdaa80cfbd43648f9b0a57e1cf58b9
Component: engine
2016-05-25 16:40:52 +02:00
e79985ff9b
Re-apply changes made in 24ec73f
...
Signed-off-by: Matt Bentley <matt.bentley@docker.com >
Upstream-commit: 0b8ea4387a3b1e415a49b9c6dbead858891a5ce9
Component: engine
2016-05-25 08:46:39 -04:00
0f6a9d4e70
Fix thin pool devicemapper docs overwritten
...
Signed-off-by: Matt Bentley <matt.bentley@docker.com >
Upstream-commit: 79205c3f061c4b690a459cb2b08b6a7df7af327c
Component: engine
2016-05-25 08:45:51 -04:00
9fc37c22c9
Add before and since filter to images
...
Add support for two now filter on the `images` command : `before` and
`since`. They work the same as the one on the `ps` command but for
images.
$ docker images --filter before=myimage
# display all images older than myimage
$ docker images --filter since=myimage
# display all images younger than myimage
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 750e16f57c0121aa8cdad1763f0bb6e54b8c6d75
Component: engine
2016-05-25 13:49:10 +02:00
3e8a3ed291
Merge pull request #22962 from normalfaults/b
...
fixed spelling error in windows.go
Upstream-commit: 2a4b4a813342294a6191425caba471a94c8a39f6
Component: engine
2016-05-25 12:21:08 +02:00
