Commit Graph

21206 Commits

Author SHA1 Message Date
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
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
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
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
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
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
ede5a6202a Remove the duplication
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 9f8f28684f196ff3790ff1c738e81743821fc860
Component: engine
2016-03-01 17:53:36 +08:00
8066a67875 Merge pull request #20791 from Microsoft/jjh/testunit-pkgsymlink
Windows CI: Turning off pkg\symlink unit testing
Upstream-commit: dac18985fa5265c38a170b733d49a8ad31d2c645
Component: engine
2016-03-01 08:18:44 +01:00
cfff83dc7e Follow symlink for --device argument.
Fixes: #13840

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7ed569efdc822811cdac3b398a16757a54fbe4c4
Component: engine
2016-03-01 07:16:19 +00:00
44ded729ad folders->directories
Signed-off-by: hsinko <21551195@zju.edu.cn>
Upstream-commit: 772f5495b7bb03a8fb97f9ae5fb5fa97c98a87b3
Component: engine
2016-02-29 21:32:30 -08:00
414f40cb7a Merge pull request #20754 from lyndaoleary/docker-terminology
Changed Docker references to Docker Engine in docs
Upstream-commit: 89f6d3b0416fa3055724099d6eaa774403480ada
Component: engine
2016-03-01 05:30:45 +01:00
5954e87608 Windows CI: Unit Test move Unix specific struct field tests to _unix.go
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 957792e485a58698ad374c5a69157d9afa7879a2
Component: engine
2016-02-29 18:04:06 -08:00
2919d69a0c Remove email address field from login
This removes the email prompt when you use docker login, and also removes the ability to register via the docker cli. Docker login, will strictly be used for logging into a registry server.

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: aee260d4eb3aa0fc86ee5038010b7bbc24512ae5
Component: engine
2016-02-29 17:53:27 -08:00
5692b958f8 Merge pull request #20792 from cpuguy83/more_stats_client_cleanup
Fixes issue with stats on start event
Upstream-commit: 187a2fb40390f52a45e5b77c2ccc2d4609e354a9
Component: engine
2016-02-29 17:33:37 -08:00
9c67867382 Changed Docker references to Docker Engine in docs
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com>
Upstream-commit: 0b882cc0140bc03dfe79462c5cdf77b972c94067
Component: engine
2016-03-01 00:57:23 +00:00
6a88816da7 Merge pull request #20782 from estesp/new-parent-dir-ownership
Fix ownership of non-existing parent dir
Upstream-commit: 67b16c73818726d9818d0229fa6cdda3e5f698b0
Component: engine
2016-03-01 01:45:38 +01:00
7097a625ab Merge pull request #20710 from Microsoft/sjw/tp4retry_fix
Fixing retry hack for TP4 to return errors in all failure cases.
Upstream-commit: 6a960069596a5d43a50b7675454169aad06972ca
Component: engine
2016-02-29 19:08:24 -05:00
8fc5eda7c4 Set default credentials store in Windows.
Use the Windows Credentials Manager when the helper
is installed in the path.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 056c27d895e6e0c416d8d4253e99f4b211a1fb4f
Component: engine
2016-02-29 17:46:07 -05:00
7075a0e284 Upgrade Go to 1.6.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 14d5c91d87fac962bbb36c12b05f3b1603aa28a8
Component: engine
2016-02-29 17:08:52 -05:00