2d730b8156
Merge pull request #20475 from Microsoft/jstarks/filegetter
...
graphdriver: Replace DiffPath with DiffGetter
Upstream-commit: 8f109829e294371cbae1eebfc771eda96d92187f
Component: engine
2016-03-02 08:36:36 -08:00
e53352c54a
docs: improve note for Fedora 22
...
Move the note more up, to prevent people from starting
the daemon with --userns-remap before touching the files.
Also clarify that these steps must be done *before* enabling
userns-remap and starting the daemon.
Also fixed some minor Markup formatting issues.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 069da069cb5386e6a441f34d5813a94fc738de59
Component: engine
2016-03-02 14:46:18 +01:00
54b43b2de5
Merge pull request #20841 from aaronlehmann/strengthen-TestPullFromCentralRegistryImplicitRefParts-2
...
Another attempt to deflake TestPullFromCentralRegistryImplicitRefParts
Upstream-commit: 4eb7a4916f1355ec450ca35c0cdaec1b9a7d0c7e
Component: engine
2016-03-02 10:43:27 +01:00
9c729d183a
Merge pull request #20831 from aaronlehmann/concurrent-upload
...
Fix concurrent uploads that share layers
Upstream-commit: 621a148da3631dd19eee724fb87cf00762aef4a3
Component: engine
2016-03-02 09:09:11 +01:00
5416da11e0
Merge pull request #20833 from Microsoft/testunit-archive
...
Windows CI: Unit Tests stop running failing archive test
Upstream-commit: b18f9cc29b8977bc003fd47aa35e8836345c301d
Component: engine
2016-03-02 08:53:11 +01:00
84f6ed6e39
Merge pull request #20842 from dongluochen/IPv6Support
...
Handle IPv6 entries in discovery
Upstream-commit: 266a75ac2219455d34aa6346596b936f42c20bcd
Component: engine
2016-03-01 21:03:37 -08:00
0c8e184e27
Remove @theadactyl
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: edeadcd9e1e41a8b2c87f4e7326e8618c578e8d6
Component: engine
2016-03-01 20:07:20 -08:00
f185bcb172
Merge pull request #20838 from Microsoft/testunit-chrootarchive
...
Windows CI: Unit Tests stop running failing chrootarchive tests
Upstream-commit: 911bb1b3b5aa0a85e110ada371a2facbc96e0b4b
Component: engine
2016-03-01 19:48:44 -08:00
e470d00835
Use net.JoinHostPort to handle address format.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: 7554e882dfe3a3eb9ec61457e20a42de528db725
Component: engine
2016-03-01 17:27:30 -08:00
a7befe92d9
Merge pull request #20828 from Microsoft/jjh/xenonworkdirfix
...
Windows: Don't create working dir for Hyper-V Containers
Upstream-commit: 7f223b72dd826c1f925b01d159a97c28983ed07b
Component: engine
2016-03-01 17:11:37 -08:00
79fb33ace9
Merge pull request #18766 from mikedanese/gcplogs
...
Add logging driver for Google Cloud Logging
Upstream-commit: 3c4d093babb6f4f4f8343f5c364c5229a9d96ba3
Component: engine
2016-03-02 02:09:44 +01:00
213ab0aa23
Another attempt to deflake TestPullFromCentralRegistryImplicitRefParts
...
Retries after v1 fallbacks were added in #20411 . The test still appears
to be flaky. There are two potential problems. The initial pull was not
protected against pulling from v1, so it could be giving us a different
hello-world image to compare against. Also, after experiencing a v1
fallback, we need to restore the original image before doing the next
pull, because otherwise the "Image is up to date for hello-world:latest"
message will not show up as expected.
See #17214 .
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 0d270cadd4b65623b1f1ae02c4fe5bcc5f81fcd3
Component: engine
2016-03-01 17:02:06 -08:00
78aa00dac4
Handle IPv6 entries.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: f7c9214e29a81679916b953572173393d5e766e5
Component: engine
2016-03-01 16:56:12 -08:00
d9a0ca1c6c
Merge pull request #20826 from LK4D4/fix_keys
...
Fix CONFIG_KEYS check in contrib/check-config.sh
Upstream-commit: 22684de8724a9767c2aee77440a894e1c5aadeb2
Component: engine
2016-03-02 01:47:50 +01:00
f7b441f49a
Windows CI: Unit Tests stop running failing chrootarchive tests
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 7f6ef097369808d1d4eda52ff7bf0d76579741aa
Component: engine
2016-03-01 14:28:29 -08:00
c772afd645
Merge pull request #20746 from cpuguy83/use_volume_for_bundles_dir
...
Use anonymous volume for bundles dir
Upstream-commit: 793d3b5a3f54313e6aaef5144877676795a1bf08
Component: engine
2016-03-01 23:24:24 +01:00
c01546df7d
Windows: Don't create working dir for Hyper-V Containers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5849a5537607f991898247c75e9298492318c7b1
Component: engine
2016-03-01 14:10:40 -08:00
fe36785c66
Windows CI: Unit Tests stop running failing archive test
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: f9cfc4c38779ea8f443c79eeb8cc1b81e8e8a5e1
Component: engine
2016-03-01 13:27:44 -08:00
65f83ffaae
Merge pull request #20817 from tiborvass/skip-TestStatsAllNewContainersAdded-remote-daemon
...
Skip TestStatsAllNewContainersAdded on remote daemons
Upstream-commit: 32d1a6cee544b0609be4ad8b07dc1794f06b431e
Component: engine
2016-03-01 13:10:44 -08:00
f87c5bb0dc
Merge pull request #20825 from LK4D4/unused
...
Remove some unused structs and fields
Upstream-commit: 106793dcbe49aedd96d74b0c4b0e32a972032d06
Component: engine
2016-03-01 12:58:35 -08:00
307185d18b
Merge pull request #20617 from nalind/journald-pkgconfig
...
Try to handle changing names for journal packages
Upstream-commit: 36401f20ceb8b689fb619df4f6c7219fe76b521c
Component: engine
2016-03-01 15:38:03 -05:00
357a20e2b5
Fix concurrent uploads that share layers
...
Concurrent uploads which share layers worked correctly as of #18353 ,
but unfortunately #18785 caused a regression. This PR removed the logic
that shares digests between different push sessions. This overlooked the
case where one session was waiting for another session to upload a
layer.
This commit adds back the ability to propagate this digest information,
using the distribution.Descriptor type because this is what is received
from stats and uploads, and also what is ultimately needed for building
the manifest.
Surprisingly, there was no test covering this case. This commit adds
one. It fails without the fix.
See recent comments on #9132 .
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 5c99eebe81958a227dfaed1145840374ce50bbbb
Component: engine
2016-03-01 11:14:44 -08:00
e03aa51b61
Merge pull request #20823 from Microsoft/testunit-migratetests
...
Windows CI: Unit Test stop running failing migration tests
Upstream-commit: 1b6956cbc3454302b4760b46de1710ff6168d83f
Component: engine
2016-03-01 13:50:00 -05:00
b4ef71e90c
Merge pull request #20820 from thaJeztah/remove-registration-docs
...
Remove some references to "register" through login
Upstream-commit: 637813b13ee0b7b6c92506f55248ce616ff0e3b8
Component: engine
2016-03-01 10:39:53 -08:00
ccc34f5cf4
Merge pull request #20822 from Microsoft/jjh/gogit
...
Go 1.6 Git 2.7.2
Upstream-commit: 8ae0192943b5546f753dd43dbe6e6ad3291addae
Component: engine
2016-03-01 10:36:47 -08:00
753938db28
Merge pull request #20797 from Microsoft/testunit-daemonunixtests
...
Windows CI: Unit Test move Unix specific struct field tests to _unix.go
Upstream-commit: 331d2b300f87e8c1feb3cee2d12d2abfe779aaa1
Component: engine
2016-03-01 13:25:49 -05:00
395ec16335
graphdriver: Replace DiffPath with DiffGetter
...
This allows a graph driver to provide a custom FileGetter for tar-split
to use. Windows will use this to provide a more efficient implementation
in a follow-up change.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 58bec40d16265362fd4e41dbd652e6fba903794d
Component: engine
2016-03-01 10:25:33 -08:00
c7e8bfe8be
Fix CONFIG_KEYS check in contrib/check-config.sh
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f5b4e1be6b599c6c6763e32cca25ea23cdaed4e2
Component: engine
2016-03-01 10:01:12 -08:00
cf6760a787
Remove some unused structs and fields
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0a352e1a906fbf7592aa95d6327776236d13392a
Component: engine
2016-03-01 09:59:29 -08:00
6b9790d5b0
Merge pull request #20684 from yongtang/13840-follow-symlink
...
Follow symlink for --device argument.
Upstream-commit: d883002fac7778e70096584c3eed1693eb7cec17
Component: engine
2016-03-01 12:44:10 -05:00
c81f81ace0
Use anonymous volume for bundles dir
...
This allows the test suite to be able to run without worrying about
the underlying fs used by the container running the daemon (e.g.
aufs-on-aufs), so long as the host running the container is running a
supported fs.
The volume will be cleaned up when the container is removed due to
`--rm`.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 0036e0f8f264b6b70952f34db439527f9def8326
Component: engine
2016-03-01 12:29:33 -05:00
4ce80e9419
Stopped running failing migration tests on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 734f52d1357785de364c8f4be2218805f160f604
Component: engine
2016-03-01 09:05:20 -08:00
6763064207
Go 1.6 Git 2.7.2
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: fa362e47e03e7b9b50e3642f50a4478d8b8f1243
Component: engine
2016-03-01 09:05:12 -08:00
e39ff2ff2f
Skip TestStatsAllNewContainersAdded on remote daemons
...
This test is often failing on remote daemons. We tried many approaches
to fix it but none worked. In order to make the CI more reliable, this
will skip the test when running against a remote daemon (e.g. win2lin).
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e80f86bce8f07122734cf4933e32ac82c9994d71
Component: engine
2016-03-01 11:49:09 -05:00
e740d4f911
Merge pull request #20587 from MHBauer/termfixes
...
do not turn post-processing on for linux-cgo terminals
Upstream-commit: bcc59fc95125e21ad59129189ff953b7086ab497
Component: engine
2016-03-01 11:37:26 -05:00
68d6754ee4
Merge pull request #20530 from hsinko/myDev
...
Add some comments for daemon/graphdriver/aufs/aufs.go
Upstream-commit: 330fb91f7d3e89d020fb1f8dca7c1fbbf884ed5d
Component: engine
2016-03-01 11:35:35 -05:00
0b40ec5cf8
Remove some references to "register" through login
...
These were left-overs from the now deprecated
and removed functionality to registrer a new account
through "docker login"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 971c080b67836b5dd62bc9270dfb348abb8536a7
Component: engine
2016-03-01 17:33:23 +01:00
461ed7624b
daemon/logger: Add logging driver for Google Cloud Logging
...
Signed-off-by: Mike Danese <mikedanese@google.com >
Upstream-commit: ed1b9fa07a0b34315d2fa624b978d3f8627319c2
Component: engine
2016-03-01 08:06:10 -08:00
afc4d63ffe
Merge pull request #20565 from kencochrane/remove_email_on_login
...
Remove email address field from login
Upstream-commit: 2453262e7ba131fede74dbf31df41da9d2f36c34
Component: engine
2016-03-01 08:02:16 -08:00
442c4a4dc8
Merge pull request #20814 from vincentbernat/fix/zsh-completion-update-5
...
zsh: Reword some descriptions
Upstream-commit: ec2efb01d206a2bae59386b8fa33ebddb8293a3b
Component: engine
2016-03-01 14:40:41 +01:00
cc884b4924
Merge pull request #20813 from thaJeztah/update-changelog
...
Update changelog with changes from 1.10.1 and .2
Upstream-commit: 79ec9c8460ca64e347377f8d67dcfc4877b3aff4
Component: engine
2016-03-01 14:29:09 +01:00
8d596ed372
zsh: Reword some descriptions
...
Use of "Set ..." and "Specify ..." are removed in favor of directly
using nouns.
Also:
- add description for `run --isolation`
- reduce description of `run --shm-size`
- fix `daemon --bip` argument handling
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 62a6d3e86c5754aed5d04400a7f84681d0470925
Component: engine
2016-03-01 14:21:34 +01:00
90fcd77c32
Merge pull request #20310 from hqhq/hq_cgroup_parent_docs
...
Add docs for cgroup-parent of systemd cgroup
Upstream-commit: 87fb26bc42afa4650fce88f8130fb7660ff898db
Component: engine
2016-03-01 13:20:23 +01:00
837da277cb
Merge pull request #20418 from calavera/go_1_6
...
Upgrade Go to 1.6.
Upstream-commit: 6a20165da78f1d1793b8355a6caa6fe3579f62f2
Component: engine
2016-03-01 13:52:19 +02:00
df1f754b29
Update CHANGELOG for 1.10.2
...
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit 7613ee933ccbe58806cce7484bce8e6a55e8bd89)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3da45ee939fc8600e1a9f1e05a28023c8f2a207e
Component: engine
2016-03-01 12:39:42 +01:00
6669b56201
Correct 1.10.1 CHANGELOG
...
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit ce4f13f604d6b080f239365f926246cf03f91c5a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8a6ac315ff13d198dc760bd410a2cadc6126d2db
Component: engine
2016-03-01 12:39:27 +01:00
0bb84d91b7
Update CHANGELOG for 1.10.1
...
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit f1cd0cabba47ba05400e7a609dffb571592a61e0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: fce54d772a761e22b61c45cc8881b7b17874d7c7
Component: engine
2016-03-01 12:39:09 +01:00
42a4bb9e98
Add docs for cgroup-parent of systemd cgroup
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c7f2079a9b3d8b38a6a933524766aa77a2658393
Component: engine
2016-03-01 18:31:17 +08:00
930d301669
Merge pull request #20796 from calavera/default_windows_creds_helper
...
Set default credentials store in Windows.
Upstream-commit: 9c7e1aeeb1b9a14691dda831da4674b76852a24f
Component: engine
2016-03-01 11:12:14 +01:00
05bba97811
Merge pull request #20810 from wenchma/remove
...
Remove the duplication
Upstream-commit: d1e7f383380123d9419462165e07ae7cdb7620ce
Component: engine
2016-03-01 11:00:02 +01:00
