521256e49f
Follow-up of 17478, unexport private method
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0ff3c10aa8328c1f574ae6dd8caf5e20c3b97dfa
Component: engine
2015-11-19 14:55:57 +01:00
1ec73033b7
Merge pull request #18065 from calavera/one_container_constructor_to_rule_them_all
...
Remove the container initializers per platform.
Upstream-commit: 877fe61f7538a36c5fe312221356f13b83abbf64
Component: engine
2015-11-18 14:06:47 -08:00
431431a2df
Merge pull request #18030 from Microsoft/sjw/pull_id_hack
...
[TP4] Windows: hacking around content addressable IDs for temporary fix.
Upstream-commit: 0d2ea52f03f2b62e5053ed056fc4db6ab305a6bc
Component: engine
2015-11-18 11:08:13 -08:00
3ac379c684
Merge pull request #18069 from vdemeester/fix-volume-doc-typo
...
Fix a small typo in volume_inspect.md
Upstream-commit: ec721639492cd4a2feb3f7a843429a923262734d
Component: engine
2015-11-18 10:14:15 -08:00
92d26f8f83
Fix a small typo in volume_inspect.md
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a96be2930a64be88a5e8bf0e3b0283c657f73844
Component: engine
2015-11-18 16:02:24 +01:00
b104ad8df6
Remove the container initializers per platform.
...
By removing deprecated volume structures, now that windows mount volumes we don't need a initializer per platform.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 060f4ae6179b10aeafa883670826159fdae8204a
Component: engine
2015-11-18 08:41:46 -05:00
550ebeac8f
Merge pull request #17973 from moxiegirl/fix-networking-issue
...
Fixing issue noted by user
Upstream-commit: 0780ad4857bb7db1caaf6c4c1d60970d5695c464
Component: engine
2015-11-18 12:49:11 +01:00
420b5b0afe
Merge pull request #17992 from nak3/fix-wrong-setting-in-systemd
...
Fix invalid proxy setting example
Upstream-commit: 3f5e5b8f57f5b4c1eb4ead9327f9d071f8fd5b8a
Component: engine
2015-11-18 12:48:41 +01:00
3989d53716
Merge pull request #18059 from QuentinPerez/typo
...
Fix typo in ARM.md
Upstream-commit: 1b1af308da301fbcc950c27d1245aff485f26855
Component: engine
2015-11-18 12:46:19 +01:00
6c12b3a81b
Merge pull request #18062 from svetlyak40wt/patch-1
...
Fix header levels for 1.9 release notes
Upstream-commit: 080b3e7527cc7c116376970d14a31f5cb6ac250b
Component: engine
2015-11-18 12:45:24 +01:00
934c18764d
Merge pull request #18050 from LK4D4/simple_err_registry
...
registry/registry.go: simplify logical expression
Upstream-commit: 927d0be4d8a9568486251a62e25a444cd19ff4ee
Component: engine
2015-11-18 11:51:55 +01:00
53e544a9dd
Fix header levels for 1.9 release notes
...
This way, parsers like allmychanges.com will be able to extract structured information about release
Signed-off-by: Alexander Artemenko <svetlyak.40wt@gmail.com >
Upstream-commit: 4cef3477b528162053a53ac05eabebf524be8be0
Component: engine
2015-11-18 12:53:48 +03:00
5ba2d283e5
Merge pull request #18046 from LK4D4/carry_16822
...
Revert AppArmor skip tests
Upstream-commit: 7179c89943d0447066bdac30d06e8a8054d2f6d3
Component: engine
2015-11-18 10:37:53 +01:00
63ffbd873f
Merge pull request #18055 from vincentbernat/fix/zsh-invalid-cache
...
zsh: ensure we have enough commands to store in the cache
Upstream-commit: 33d9ae358cbeb7093a61eff9b2fa7d842e1d96f1
Component: engine
2015-11-18 10:36:32 +01:00
468c0627ce
Merge pull request #18056 from vincentbernat/fix/zsh-no-lxc
...
zsh: remove lxc-related completion
Upstream-commit: 5d53e39c02abcc768db9f504d02dcb2474b4c7d7
Component: engine
2015-11-18 10:35:59 +01:00
3da1f466c4
Merge pull request #17991 from nak3/proxy-env
...
docker info suppports case-insensitive proxy env settings
Upstream-commit: 57b42250ce2afb9a0a082f02fe52c9179bee6bb4
Component: engine
2015-11-18 10:35:06 +01:00
ce3541ad8a
Merge pull request #18004 from Gobella/master
...
update docker_cli_pull_trusted_test.go
Upstream-commit: db08adb5cbeefeba5c0c094f267863cb145c25f9
Component: engine
2015-11-18 10:32:28 +01:00
0ee800bcb5
Fix typo in ARM.md
...
Signed-off-by: Quentin Perez <qperez@ocs.online.net >
Upstream-commit: 25cfa80119df7e2859729bdac4bae4a753b82d62
Component: engine
2015-11-18 09:46:39 +01:00
9ac360f32a
zsh: remove lxc-related completion
...
LXC support has been deprecated and the related completion has been
removed in #17700 but was added back in #17334 .
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 8105a3a366bb22d1df843c828a16b6cae26e9531
Component: engine
2015-11-18 08:13:03 +01:00
f0c2b7dcae
zsh: ensure we have enough commands to store in the cache
...
Otherwise, the cache would be invalid and won't be refreshed soon. This
can happen when the user has the completion installed before docker is
installed.
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 61564bcb5f79754cf4e17a707731d9f78169c150
Component: engine
2015-11-18 08:08:43 +01:00
8bf64dbed0
docker info suppports case-insensitive proxy env settings
...
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com >
Upstream-commit: 84781a5df753f5ba127538e8542fcb7c94bb56fa
Component: engine
2015-11-18 10:58:19 +09:00
b3c9150d28
Merge pull request #18047 from aaronlehmann/push-fix
...
Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent
Upstream-commit: c00c64c20eb65152b8f379e7efaf9e014656bcdd
Component: engine
2015-11-17 17:03:13 -08:00
42a56c8bb4
Merge pull request #17986 from bogdangrigg/master
...
Fix small typos in documentation files
Upstream-commit: c83373112c908f7c5afc85fc6b08640817920a6d
Component: engine
2015-11-17 16:45:38 -08:00
4457dd940b
Merge pull request #18011 from lrkwz/patch-1
...
Update ubuntulinux.md
Upstream-commit: 2ee56ce1e1b3f8f6ab72b4235ad28387fe81b675
Component: engine
2015-11-17 16:44:33 -08:00
1944ac916a
Merge pull request #17261 from mountkin/remove-unused-daemon-config
...
remove the unused DefaultNetwork member from daemon.Config
Upstream-commit: 3f508f08deca82536b4e1ef6d591335e98e3f5d1
Component: engine
2015-11-17 16:33:11 -08:00
6064eebd4e
Merge pull request #17866 from shekhargulati/patch-1
...
added rx-docker-client library
Upstream-commit: 662b9623c1e47676f40b5dccd150475d54cd88a0
Component: engine
2015-11-17 16:15:15 -08:00
8b4eae12b3
registry/registry.go: simplify logical expression
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 90e2459ecb82c9cd0f231a04776272c6ffe435e4
Component: engine
2015-11-17 16:12:11 -08:00
ebcb6dad25
Merge pull request #17617 from askb/17168_pull_error_fix
...
Fix for #17168 issue
Upstream-commit: e2417e3e926d2b45049a663bc62828a70fbfab2a
Component: engine
2015-11-17 16:10:44 -08:00
7d18cf6c65
Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent
...
This fixes an issue where two images with the same filesystem contents
and configuration but different remote IDs could share a v1Compatibility
file, resulting in corrupted manifests.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 0ab6b1d9221f7a2a65c6565fed8f3d6f29fcec2d
Component: engine
2015-11-17 16:05:09 -08:00
4d1e8a4a9f
Merge pull request #17294 from zhangjianfnst/16756-integration-cli-checkers-cp
...
Use checker assert for integration-cli/docker_cli_cp_* four files.
Upstream-commit: a935359ec7c2c7f0ae4c1c389c959387c01e725e
Component: engine
2015-11-17 16:00:00 -08:00
76f661e7cd
Merge pull request #17452 from aditirajagopal/16756-docker_cli_by_digest_test
...
Checkers on docker_cli_by_digest_test
Upstream-commit: 92ea146790accdf4a07cc311a69a74f840d053ce
Component: engine
2015-11-17 15:58:05 -08:00
fe4028f4f6
Merge pull request #17334 from sdurrheimer/zsh-completion-log-options
...
Add zsh completion for log options
Upstream-commit: 346d195f6a8ed5217cb859ed1a6673eeb840e21d
Component: engine
2015-11-17 15:53:31 -08:00
7f6a96fa5d
Merge pull request #17434 from little-arhat/fix/newlines-in-json-status
...
Add newlines to FormatProgress for JSON as well
Upstream-commit: 53556183c7649480852d13d168a28dcfe92ac7f1
Component: engine
2015-11-17 15:52:31 -08:00
c4d89a3f60
Merge pull request #17478 from vdemeester/pr-13921
...
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
Upstream-commit: 104dab87ea73fbf7e4e592c2045b4f1ab56c6cfe
Component: engine
2015-11-17 15:44:57 -08:00
804455e1fb
Merge pull request #17593 from daehyeok/refactoring_json_log
...
Refactoring json log driver
Upstream-commit: adce1981f4c7fe653ae76cdd1f84d75f88b273cd
Component: engine
2015-11-17 15:38:52 -08:00
7810e6e5eb
Merge pull request #18000 from daehyeok/fix_dry_run_test
...
Modified cpuset test for unicore test environment
Upstream-commit: ca0b41e3373013c06fb7c23428d7cf0616a57824
Component: engine
2015-11-17 15:15:09 -08:00
64fc0f7510
Merge pull request #18023 from LK4D4/goodbye_dind
...
Remove cgroup mounting in dind
Upstream-commit: 7147ac6ce730fee150caeb627b426fb9f45daf80
Component: engine
2015-11-17 15:12:08 -08:00
8c1597920f
Windows: hacking around content addressable IDs for temporary fix.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: d860ff79a0df4f406578b0a206769f4239072d86
Component: engine
2015-11-17 14:03:36 -08:00
9c5f927ad3
Modified cpuset test for unicore test environment
...
Modified TestInspectApiCpusetInConfigPre120 and
TestContainerApiCreateWithCpuSharesCpuset for working on unicore cpu
environment.
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
Upstream-commit: a9afebae6240cfd48a93c182cbbdff4f09d6a6a0
Component: engine
2015-11-17 13:28:09 -07:00
0fb0e27d0c
Merge pull request #17419 from nathwill/cent-install-docs
...
fix yum install docs
Upstream-commit: aeccd45e5b4074cebb1cbe3bb51b6bde4111048a
Component: engine
2015-11-17 20:57:15 +01:00
265a183ad6
Skip apparmor tests on User Namespace
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 70ce2d9b10e7119218ccf10a9b83d86acd2b1ed6
Component: engine
2015-11-17 11:49:31 -08:00
ab3af36722
Merge pull request #18002 from Microsoft/10662-registerlinks
...
Windows: Disable links
Upstream-commit: d3744fbeb109bffbaeba35c94858afe3bf50376c
Component: engine
2015-11-17 11:48:53 -08:00
99449052ad
Revert "Skip TestAppArmorDeniesChmodProc"
...
This reverts commit 04e1015aa06785210dc6a3e4d4ad66700a8d51b0.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 0df0b6b44300896d82127fac628a1021c25ef861
Component: engine
2015-11-17 11:46:42 -08:00
5b2291ae91
Revert "Skip TestRunUnshareProc"
...
This reverts commit 03dce24137c82caa04c215d983eac06a3edc084c.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 1bf5fcd911a7f773a1f6c7511e977d87cca5b391
Component: engine
2015-11-17 11:46:42 -08:00
b087b271a9
Merge pull request #18024 from LK4D4/simple_byparent
...
graph/graph.go: simplify appending to slice in map in byParent
Upstream-commit: e58b0bba7fac16e2bab57ad66caeed1663e2c27c
Component: engine
2015-11-17 11:45:24 -08:00
f3cdb6f05f
Merge pull request #17974 from anusha-ragunathan/fsMagic
...
Fix devmapper backend in docker info
Upstream-commit: 1ecb9a40db176489ac8760251abe56e560bc848d
Component: engine
2015-11-17 11:44:48 -08:00
1d5287a6dd
Merge pull request #16639 from mrunalp/skip_dev_setup
...
Skip /dev setup in container when it is bind mounted in
Upstream-commit: 91876563052a1d84902e365cbe8b9eaf96846e91
Component: engine
2015-11-17 11:36:00 -08:00
c9e22f7865
Merge pull request #18027 from tpounds/fix-err-message-typo
...
Fix error typo when --expose and --net are specified
Upstream-commit: 19debeb255c0676148a0efeb2cd7f0f3f38e9edd
Component: engine
2015-11-17 11:34:40 -08:00
7023420733
Merge pull request #18028 from LK4D4/carry_17174
...
Use /usr/lib/os-release if /etc/os-release is missing.
Upstream-commit: d0696ab7f6ff33f072e5b77ef54a6c64a3227741
Component: engine
2015-11-17 11:26:24 -08:00
38c311e5a8
Merge pull request #18043 from tianon/freebsd-package-name
...
Fix "./docker" package name on freebsd
Upstream-commit: 68336bc8327232e6a165ab33e6dc9fc25a7872e7
Component: engine
2015-11-17 11:17:26 -08:00
