Commit Graph

22690 Commits

Author SHA1 Message Date
Sebastiaan van Stijn dd850530a9 Vendor engine-api
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-03-02 23:32:25 +01:00
Sebastiaan van Stijn 747a486b4a Add KernelMemory to "info" and show warning
This change adds "KernelMemory" to the /info endpoint and
shows a warning if KernelMemory is not supported by the kernel.

This makes it more consistent with the other memory-limit
options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-03-02 23:32:25 +01:00
Vincent Demeester 508a17baba Merge pull request #20388 from hqhq/hq_add_cgroup_driver_info
Add CgroupDriver to docker info
2016-03-02 23:17:27 +01:00
David Calavera 0e0a8ade61 Merge pull request #20875 from Microsoft/jjh/testlogsapiwithstdout
Windows CI Reliablity: TestLogsApiWithStdout
2016-03-02 13:26:39 -08:00
Vincent Demeester 6dcb14ce05 Merge pull request #20860 from runcom/fix-logout-credsStore
api: client: fix login/logout with creds store
2016-03-02 20:17:19 +01:00
John Howard 76a4009293 Windows CI Reliablity: TestLogsApiWithStdout
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-03-02 10:26:15 -08:00
Sebastiaan van Stijn 34a56d2cae Merge pull request #20839 from icecrime/failing_ci_label
Introduce `status/failing-ci` label
2016-03-02 19:08:56 +01:00
Aaron Lehmann 613d364e23 Merge pull request #20868 from LK4D4/unused_ctx
Remove unused ctx from v1Pusher
2016-03-02 10:05:46 -08:00
Vincent Demeester b65fd8e879 Merge pull request #20858 from mountkin/validate-log-opts-again
validate log-opt when creating containers AGAIN (fixing drunkard's code)
2016-03-02 18:27:00 +01:00
Antonio Murdaca 0eccc3838e api: client: fix login/logout with creds store
Make sure credentials are removed from the store at logout (not only
in the config file). Remove not needed error check and auth erasing
at login (auths aren't stored anywhere at that point).
Add regression test.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-02 17:51:50 +01:00
David Calavera 8f109829e2 Merge pull request #20475 from Microsoft/jstarks/filegetter
graphdriver: Replace DiffPath with DiffGetter
2016-03-02 08:36:36 -08:00
Alexander Morozov a4dbbe7d89 Remove unused ctx from v1Pusher
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-02 07:59:12 -08:00
Antonio Murdaca 7c64681ce0 Merge pull request #20861 from thaJeztah/docs-improve-userns-note-for-fedora
docs: improve note for Fedora 22
2016-03-02 16:12:11 +01:00
Sebastiaan van Stijn 069da069cb 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>
2016-03-02 14:46:18 +01:00
Shijiang Wei 068085005e validate log-opt when creating containers AGAIN
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-03-02 20:30:26 +08:00
Qiang Huang ca89c329b9 Add CgroupDriver to docker info
Fixes: #19539

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-03-02 20:07:06 +08:00
Vincent Demeester 4eb7a4916f Merge pull request #20841 from aaronlehmann/strengthen-TestPullFromCentralRegistryImplicitRefParts-2
Another attempt to deflake TestPullFromCentralRegistryImplicitRefParts
2016-03-02 10:43:27 +01:00
Vincent Demeester 621a148da3 Merge pull request #20831 from aaronlehmann/concurrent-upload
Fix concurrent uploads that share layers
2016-03-02 09:09:11 +01:00
Vincent Demeester b18f9cc29b Merge pull request #20833 from Microsoft/testunit-archive
Windows CI: Unit Tests stop running failing archive test
2016-03-02 08:53:11 +01:00
David Calavera 266a75ac22 Merge pull request #20842 from dongluochen/IPv6Support
Handle IPv6 entries in discovery
2016-03-01 21:03:37 -08:00
David Calavera 04a3cedf44 Merge pull request #20846 from icecrime/remove_theadactyl
Remove @theadactyl
2016-03-01 21:03:23 -08:00
Arnaud Porterie edeadcd9e1 Remove @theadactyl
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-03-01 20:07:20 -08:00
David Calavera 911bb1b3b5 Merge pull request #20838 from Microsoft/testunit-chrootarchive
Windows CI: Unit Tests stop running failing chrootarchive tests
2016-03-01 19:48:44 -08:00
Dong Chen 7554e882df Use net.JoinHostPort to handle address format.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-01 17:27:30 -08:00
David Calavera 7f223b72dd Merge pull request #20828 from Microsoft/jjh/xenonworkdirfix
Windows: Don't create working dir for Hyper-V Containers
2016-03-01 17:11:37 -08:00
Sebastiaan van Stijn 3c4d093bab Merge pull request #18766 from mikedanese/gcplogs
Add logging driver for Google Cloud Logging
2016-03-02 02:09:44 +01:00
Aaron Lehmann 0d270cadd4 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>
2016-03-01 17:02:06 -08:00
Dong Chen f7c9214e29 Handle IPv6 entries.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-01 16:56:12 -08:00
Sebastiaan van Stijn 22684de872 Merge pull request #20826 from LK4D4/fix_keys
Fix CONFIG_KEYS check in contrib/check-config.sh
2016-03-02 01:47:50 +01:00
Arnaud Porterie cf6016c24e Introduce `status/failing-ci` label
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-03-01 14:52:11 -08:00
Darren Stahl 7f6ef09736 Windows CI: Unit Tests stop running failing chrootarchive tests
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-03-01 14:28:29 -08:00
Sebastiaan van Stijn 793d3b5a3f Merge pull request #20746 from cpuguy83/use_volume_for_bundles_dir
Use anonymous volume for bundles dir
2016-03-01 23:24:24 +01:00
John Howard 5849a55376 Windows: Don't create working dir for Hyper-V Containers
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-03-01 14:10:40 -08:00
Darren Stahl f9cfc4c387 Windows CI: Unit Tests stop running failing archive test
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-03-01 13:27:44 -08:00
David Calavera 32d1a6cee5 Merge pull request #20817 from tiborvass/skip-TestStatsAllNewContainersAdded-remote-daemon
Skip TestStatsAllNewContainersAdded on remote daemons
2016-03-01 13:10:44 -08:00
Arnaud Porterie 106793dcbe Merge pull request #20825 from LK4D4/unused
Remove some unused structs and fields
2016-03-01 12:58:35 -08:00
Tibor Vass 36401f20ce Merge pull request #20617 from nalind/journald-pkgconfig
Try to handle changing names for journal packages
2016-03-01 15:38:03 -05:00
Aaron Lehmann 5c99eebe81 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>
2016-03-01 11:14:44 -08:00
Brian Goff 1b6956cbc3 Merge pull request #20823 from Microsoft/testunit-migratetests
Windows CI: Unit Test stop running failing migration tests
2016-03-01 13:50:00 -05:00
David Calavera 637813b13e Merge pull request #20820 from thaJeztah/remove-registration-docs
Remove some references to "register" through login
2016-03-01 10:39:53 -08:00
David Calavera 8ae0192943 Merge pull request #20822 from Microsoft/jjh/gogit
Go 1.6 Git 2.7.2
2016-03-01 10:36:47 -08:00
Brian Goff 331d2b300f Merge pull request #20797 from Microsoft/testunit-daemonunixtests
Windows CI: Unit Test move Unix specific struct field tests to _unix.go
2016-03-01 13:25:49 -05:00
John Starks 58bec40d16 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>
2016-03-01 10:25:33 -08:00
Alexander Morozov f5b4e1be6b Fix CONFIG_KEYS check in contrib/check-config.sh
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-01 10:01:12 -08:00
Alexander Morozov 0a352e1a90 Remove some unused structs and fields
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-01 09:59:29 -08:00
Brian Goff d883002fac Merge pull request #20684 from yongtang/13840-follow-symlink
Follow symlink for --device argument.
2016-03-01 12:44:10 -05:00
Brian Goff 0036e0f8f2 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>
2016-03-01 12:29:33 -05:00
Darren Stahl 734f52d135 Stopped running failing migration tests on Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-03-01 09:05:20 -08:00
John Howard fa362e47e0 Go 1.6 Git 2.7.2
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-03-01 09:05:12 -08:00
Tibor Vass e80f86bce8 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>
2016-03-01 11:49:09 -05:00