toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,804 Commits 3 Branches 295 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov 71f0714dde Merge pull request #19600 from aaronlehmann/buildenvusage2 
Slight TestBuildEnvUsage2 speedup
Upstream-commit: 7be8f7264435db8359ec9fd18362391bad1ca4d7
Component: engine
 2016-01-22 20:38:45 -08:00
Alexander Morozov 091ca20c63 Use pools.Copy instead of io.Copy for overlay.copyRegular 
That function is pretty heavy used on container start. Autoallocating
buffer can be painful.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3f5e1c69b345b25d9b1c57f5d492a0e3fd4432a0
Component: engine
 2016-01-21 08:53:37 -08:00
Alexander Morozov 2f86eee3b4 Reuse subsystems mountpoints between checks 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 781a33b6e77a122f2a171a941da3a1798fc73c27
Component: engine
 2016-01-20 19:20:59 -08:00
Alexander Morozov 1e5e2cad46 Reuse *sysinfo.SysInfo instance in verification 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 22ebeede3010e30a0b74c58900f7ed08f7489f93
Component: engine
 2016-01-20 17:08:10 -08:00
Alexander Morozov 077cda22f8 Merge pull request #19513 from crosbymichael/tty-restore 
Move tty set and restore to caller
Upstream-commit: 4a9523adc90de8fea1de23b5e33ae184bdd9f25e
Component: engine
 2016-01-20 15:05:14 -08:00
Alexander Morozov 88d33e25a1 Merge pull request #19503 from jfrazelle/update-logrus 
bump logrus
Upstream-commit: 7bddbdf360f50fed07cd21b21270f5f287222d8c
Component: engine
 2016-01-20 12:54:49 -08:00
Alexander Morozov 4e4ba6f308 Move long compilations before Go install in Dockerfile 
Now we can avoid long compilations on Go update.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c38cba3b8c769d39a1e42e0b79fa2eeb77fd6f04
Component: engine
 2016-01-19 22:43:42 -08:00
Alexander Morozov d9d4f4eb39 Remove obsolete comment 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3dc8829a83d72d3a8e1d9b6a88c9e6ff9ecaf4a0
Component: engine
 2016-01-19 12:17:40 -08:00
Alexander Morozov d3d0a35112 Merge pull request #19340 from Microsoft/jjh/rsrcfix 
Windows: Remove linkmode internal hack
Upstream-commit: 790e648c0613e435be56727e1ebbdc0ccf8aeb56
Component: engine
 2016-01-15 14:10:56 -08:00
Alexander Morozov f64326633e Merge pull request #19374 from Microsoft/jjh/termdeadcode 
Windows: Remove dead/unused code
Upstream-commit: 402ba93f68fd969536bfd541663c57d44cc4e8dd
Component: engine
 2016-01-15 13:30:23 -08:00
Alexander Morozov f9405712ff Merge pull request #19254 from aboch/v6b 
Account docker0 IPv6 address on daemon start
Upstream-commit: 7ea65da7efe317d9dabc07557c8b2d196d20d815
Component: engine
 2016-01-13 09:48:41 -08:00
Alexander Morozov b2898bb348 Merge pull request #19294 from runcom/fix-check-test 
integration-cli: check nil before Close'ing
Upstream-commit: ba15b6f04936b3e38fb5b832e28ceb02277fc2e5
Component: engine
 2016-01-13 09:28:54 -08:00
Alexander Morozov 5d2a9d60e5 Fix race on reading endpoint data 
Race is with its cleanup.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 5abef06a158b437a020d59ffdba740d19613852e
Component: engine
 2016-01-11 14:28:07 -08:00
Alexander Morozov bc47f91463 Merge pull request #16032 from cpuguy83/remove_sqlite_dep 
Build names and links at runtime - no more sqlite
Upstream-commit: 9a23569ecf48e07b6c6e7c1d734b54c7ce4c666a
Component: engine
 2016-01-11 10:59:49 -08:00
Alexander Morozov 12ab071eb0 Merge pull request #19135 from Microsoft/jjh/securitywarning 
Windows: Fix security warning regression
Upstream-commit: 807d575b5ef1785ded1038dca2cfbf2afa2d5a0c
Component: engine
 2016-01-08 13:55:41 -08:00
Alexander Morozov d9a92e1dc3 Choose default-cgroup parent by cgroup driver 
It's "/docker" for cgroupfs and "system.slice" for systemd.

Fix #19140

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c1cd45d547ef26cf988dc72d456430361dafcf08
Component: engine
 2016-01-07 08:56:26 -08:00
Alexander Morozov 57528b213f Merge pull request #19141 from duglin/FixVendor 
Update src with latest vendor.sh stuff
Upstream-commit: d2b8160513e8b43ce3b0e3a79df676f4a10a7974
Component: engine
 2016-01-06 14:45:58 -08:00
Alexander Morozov 0c89fbf389 Add ability to set cgroup parent for all containers 
Fix #18022

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2e3186ab065a7130a6e6267d86750848d5eb7d80
Component: engine
 2016-01-04 15:16:25 -08:00
Alexander Morozov 143c9b690b Merge pull request #18762 from calavera/runconfig_to_types 
Move container configuration types to api/types/container.
Upstream-commit: 030347c3c9505fa80eed0ecfde5d1e9af05c3cbc
Component: engine
 2015-12-22 14:22:08 -08:00
Alexander Morozov a9fe9a6c5b Merge pull request #18857 from calavera/catch_pipeline_error 
Catch command pipeline error.
Upstream-commit: 9f228b37fc1108bee544973841513ffd0d06035c
Component: engine
 2015-12-22 13:34:56 -08:00
Alexander Morozov 8e30598fab Merge pull request #18855 from rhatdan/volume-tmpfs 
No options to tmpfs is valid
Upstream-commit: 9c89e83ff1b8d6598b487bebbbc29cef58840cc0
Component: engine
 2015-12-22 12:24:51 -08:00
Alexander Morozov 8ec62ec94b Merge pull request #18830 from calavera/tls_verify_godoc 
Add godoc comment about client tls verification.
Upstream-commit: 1a8e8f2967c8f17072d4f2b43ad0c69dd6952ac8
Component: engine
 2015-12-21 10:02:32 -08:00
Alexander Morozov 306ef7b263 Merge pull request #17692 from vdemeester/images-format 
Add --format support to images command
Upstream-commit: 42460b6772323552bfb58ae703124145ffd8a56b
Component: engine
 2015-12-21 09:57:29 -08:00
Alexander Morozov ce07d20209 Merge pull request #18763 from calavera/fix_raw_inspect 
Print the raw inspected elements when there is no template for `docker inspect`.
Upstream-commit: 58ebc71272d3facec798664366cc169aa8df8449
Component: engine
 2015-12-18 15:25:38 -08:00
Alexander Morozov 0f2a0bed09 Merge pull request #18744 from runcom/plugins-deadcode 
pkg: plugins: remove dead code
Upstream-commit: 5553aab705d7ffed1bee94b8df860a36af767a20
Component: engine
 2015-12-17 10:50:04 -08:00
Alexander Morozov 5fc03c3956 Merge pull request #18719 from jfrazelle/vendor-updates 
update and run vendor script
Upstream-commit: f8140332c0ea83a0821550452ed0aa26e2df3b3b
Component: engine
 2015-12-16 11:27:02 -08:00
Alexander Morozov 35734375ef Merge pull request #18691 from jfrazelle/remove-oraclelinux-6 
remove oracle linux 6 for time being
Upstream-commit: 731433a55b02aec2ba1a534fc48883f42096acb0
Component: engine
 2015-12-15 16:42:31 -08:00
Alexander Morozov 0441751bdc Merge pull request #18687 from calavera/move_filters_to_api 
Move filters package to the API.
Upstream-commit: 803c7626ca076ddee50de5861531aa174e88e397
Component: engine
 2015-12-15 16:25:27 -08:00
Alexander Morozov 88b341f00a Merge pull request #18683 from estesp/no-dev-symlink-chown 
Remove unecessary chown on mqueue device path
Upstream-commit: 33abc6f8af0fce5bd3923a3e8a1f5748f282ec92
Component: engine
 2015-12-15 12:47:03 -08:00
Alexander Morozov 61bb408463 Merge pull request #18531 from coolljt0725/update_container_networking_on_create 
fix docker inspect return unconsistent network settings  of created container and stopped container
Upstream-commit: 812a7c204a2396700ca1e95d949659b16302a120
Component: engine
 2015-12-15 08:47:54 -08:00
Alexander Morozov 19f8a4f8fb Merge pull request #18486 from aboch/vnd 
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Upstream-commit: 260cbb19c93ba1dc5aa0f4065cd5c95241bbd59d
Component: engine
 2015-12-14 13:32:01 -08:00
Alexander Morozov 4b93eb25be Merge pull request #18612 from mrunalp/update_runc 
Update runc/libcontainer to v0.0.6
Upstream-commit: ecc3717cb17313186ee711e624b960b096a9334f
Component: engine
 2015-12-14 13:05:53 -08:00
Alexander Morozov c6e3ae9ff6 Merge pull request #18595 from mariussturm/gelf-no-trim-18568 
don't trim GELF message
Upstream-commit: 5525593a681a478dc51d7ce10a8cb3135d39e785
Component: engine
 2015-12-11 07:39:44 -08:00
Alexander Morozov 9847131043 Merge pull request #18353 from aaronlehmann/transfer-manager 
Improved push and pull with upload manager and download manager
Upstream-commit: ac453a310bac6bdd7cd9d780a63d4168064570d1
Component: engine
 2015-12-10 14:52:48 -08:00
Alexander Morozov aef06e4e19 Merge pull request #18566 from coolljt0725/fix_18544 
Probably fix flaky test TestExecTTY
Upstream-commit: 9381c744b89bf006e90483738601a24323647678
Component: engine
 2015-12-10 12:53:47 -08:00
Alexander Morozov bfa780294c Merge pull request #18565 from hqhq/hq_fix_ensure_format 
Fix format issue
Upstream-commit: 8e2c27abeb5c870045aa8ba8fd8863e8e2d2fd84
Component: engine
 2015-12-10 08:27:15 -08:00
Alexander Morozov 8ac83c81d8 Merge pull request #18485 from aaronlehmann/errors-bounds-check 
Add missing bounds check in ContinueOnError
Upstream-commit: 591493bfb56a3f7ad2338b7d6620ef8d631f21ef
Component: engine
 2015-12-08 12:40:55 -08:00
Alexander Morozov b3330dfcec Merge pull request #18479 from aaronlehmann/flaky-logs-test 
Fix flaky test TestLogsSince
Upstream-commit: adb19755e1d0b6e2e7693ddb7932f26e63d1b0b5
Component: engine
 2015-12-08 09:03:39 -08:00
Alexander Morozov 38a3ce820e Merge pull request #18476 from aaronlehmann/v1-push-size 
Use DiffSize instead of Size in v1 push
Upstream-commit: 1f0886a71338339d6917953c5efb729f7491aa08
Component: engine
 2015-12-07 14:09:14 -08:00
Alexander Morozov de4815997a Add vendor/pkg to .dockerignore 
It's in .gitignore too, so why not

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 9c8d6edbf15a33045cffb37b6406715dc8776675
Component: engine
 2015-12-04 17:03:24 -08:00
Alexander Morozov 339236ffdf Merge pull request #18408 from tonistiigi/disable-systemd-timeout 
Disable timeout for systemd
Upstream-commit: 23f00624a174dce985615ba4438303039b16dd09
Component: engine
 2015-12-04 12:34:19 -08:00
Alexander Morozov 6790de2194 Merge pull request #18412 from aaronlehmann/runcommand-race 
Fix race in RunCommandWithOutputForDuration
Upstream-commit: 7c1c96551d41e369a588e365a9bb99acb5bc8fdb
Component: engine
 2015-12-03 19:35:04 -08:00
Alexander Morozov 9dd07d2075 Merge pull request #18411 from aaronlehmann/unit-test-timing 
Adjust TestDockerCmdWithTimeout timeout to improve reliability
Upstream-commit: 4e6bea596472a02509bb966d077a93fe9490f6e1
Component: engine
 2015-12-03 16:34:36 -08:00
Alexander Morozov 329ce171d3 Use /docker as cgroup parent instead of docker 
It means that containers will be created under root cgroup and not under
daemon cgroup.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 4b55765c11b3ae3bc02385ad17fe2a3c419e71bc
Component: engine
 2015-12-03 08:42:45 -08:00
Alexander Morozov 50eaa45a45 Merge pull request #18375 from vbatts/tar-split_update 
vendor: update tar-split to v0.9.11
Upstream-commit: 1475f567cbf002aad3db6ed829d9285a70febdb0
Component: engine
 2015-12-02 20:25:07 -08:00
Alexander Morozov d55350cb73 Merge pull request #18376 from jfrazelle/fix-default-shm-size 
fix default shm size in test
Upstream-commit: 61773e5cbf62badf41c6c9d110fca2e7b036a6ac
Component: engine
 2015-12-02 12:54:07 -08:00
Alexander Morozov 8ce05800f4 daemon/delete.go: use less confusing naming of functions 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 828f63f1abbad4246bd5198f02c9c34ce0d44b2b
Component: engine
 2015-12-02 11:10:14 -08:00
Alexander Morozov e9c9b85f8b Fix race between two ContainerRm 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 4d1007d75c24f4e9f1d8df18cb3faae53b183661
Component: engine
 2015-12-01 20:13:18 -08:00
Alexander Morozov 0a4f515b90 Merge pull request #18352 from jfrazelle/update-go-md2man 
update go-md2man because code.google.com needs to go away
Upstream-commit: e75da4b6fffbcf9dab86cd581e962a19d3efa35a
Component: engine
 2015-12-01 16:04:24 -08:00
Alexander Morozov a68d03ab84 Merge pull request #18343 from calavera/unify_debug_logging 
[Carry 18260] Remove info logging from every api call.
Upstream-commit: 3962fe5d7b47383b752383b48adf7e1ac0a6f202
Component: engine
 2015-12-01 13:42:57 -08:00
Alexander Morozov 5ed9289ac6 Merge pull request #18308 from mountkin/delete-graphdb-later 
fix 2 corner cases in container create cleanup and container removal
Upstream-commit: 5efb37616ffd4b848578424ebb7b290af9965eff
Component: engine
 2015-12-01 13:19:59 -08:00
Alexander Morozov 132ab17e74 Merge pull request #18239 from jfrazelle/17783-fix-regex 
Fix parsing of apparmor pcre syntax
Upstream-commit: 377e1d75f93101acbff7cf06df2c05a2df3b6760
Component: engine
 2015-11-30 09:15:25 -08:00
Alexander Morozov 3f8975aab8 Remove listenbuffer package 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a0251b2bbfe259c8d089e34415159f1b609779be
Component: engine
 2015-11-30 09:04:59 -08:00
Alexander Morozov 59911bba39 Remove usage of listenbuffer package 
It actually adds nothing to queuing requests.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ca5795cef810c85f101eb0aa3efe3ec8d756490b
Component: engine
 2015-11-30 09:04:55 -08:00
Alexander Morozov c3cf7195f6 Merge pull request #17108 from coolljt0725/fix_remove_image 
Fix docker rmi trying to remove a being used parent
Upstream-commit: b8c21783f0c7915779de3fa487f233ebc145738d
Component: engine
 2015-11-26 12:21:30 -08:00
Alexander Morozov cb358947f2 Merge pull request #18232 from mqliang/defer 
move defer statement for readability
Upstream-commit: 88aca3610fecdf790c4604ed705d31f8d17ef8e6
Component: engine
 2015-11-26 12:20:55 -08:00
Alexander Morozov 71c2fd53b4 Merge pull request #18106 from runcom/bump-runc-libcontainer 
vendor: bump libcontainer and its deps
Upstream-commit: 0b5a28590f278881309b77f42be06a1da4212e1e
Component: engine
 2015-11-26 12:15:48 -08:00
Alexander Morozov 4190d23ba7 Merge pull request #18202 from aidanhs/aphs-content-addressability-layerstore 
Rearrange layerstore locking
Upstream-commit: 900c8f5847b9f6a51a4a1a3d03631bad7b3149db
Component: engine
 2015-11-24 14:53:10 -08:00
Alexander Morozov 62cd0ad97a Merge pull request #18203 from aidanhs/aphs-content-addressability-layerstore-releaselayer 
Make releaseLayers iterative rather than recursive, remove useless func
Upstream-commit: 5463e2657009ee904e83f5df256dae9d12168f1a
Component: engine
 2015-11-24 13:41:42 -08:00
Alexander Morozov 6689d60843 Merge pull request #18150 from unclejack/add_python_dev 
Dockerfile: add python-dev to fix Python.h errors
Upstream-commit: 0dec4403b0a6f5f56d37e22565bf060da8f399df
Component: engine
 2015-11-24 10:31:52 -08:00
Alexander Morozov 2908bc42ae Merge pull request #18196 from cpuguy83/18190_on_your_marks 
Fix race in locker call to `dec()`
Upstream-commit: ac055a7d54dfec1763ea67ba037e689638c59762
Component: engine
 2015-11-24 09:54:59 -08:00
Alexander Morozov efe1efbbf1 Merge pull request #18175 from crosbymichael/arm-doc 
Change and move ARM.md doc to project
Upstream-commit: 18c9fe0cecda1d8eafe2b8be732fd08640140617
Component: engine
 2015-11-23 13:57:42 -08:00
Alexander Morozov 6214bfcd81 Merge pull request #18104 from hypriot/17802-remove-journald-to-fix-dynbinary-build-on-ARM 
remove journald to fix dynbinary build on ARM
Upstream-commit: 968700837890c2a5d1dc41aa871f3c94aca07640
Component: engine
 2015-11-23 10:38:45 -08:00
Alexander Morozov fa0725341b Merge pull request #18080 from aditirajagopal/16756-docker_api_images_test 
Checkers on integration-cli/docker_api_images_test
Upstream-commit: 804d2f73c8996600b3d57c69267c3131da2d3b37
Component: engine
 2015-11-23 10:21:52 -08:00
Alexander Morozov 84c6cbaa3c Merge pull request #18135 from calavera/exec_store 
Move exec store to its own package inside the daemon.
Upstream-commit: afe6c1f30c9563c0f142ef56067b0afcad4512ef
Component: engine
 2015-11-20 16:36:18 -08:00
Alexander Morozov 1a93f456bb Merge pull request #18126 from tiborvass/merge_release_v1.9.1 
Merge release v1.9.1
Upstream-commit: 6980113d104725f42f69c2ce4ce1be40b6d5bf65
Component: engine
 2015-11-20 10:45:59 -08:00
Alexander Morozov 6d12941a33 Merge pull request #16168 from NIWAHideyuki/16164-shm-size 
Addition of "--shm-size" to which size of /dev/shm is changed
Upstream-commit: a76bdea21ba204b1cdc6648a182ae82355350a5f
Component: engine
 2015-11-20 10:01:48 -08:00
Alexander Morozov 1d43e38301 Merge pull request #18082 from MHBauer/gh9406 
Remove defaults for flags/options that expect no value
Upstream-commit: 9c21e852b2674a68d9b0fbbada368f5b7818b494
Component: engine
 2015-11-19 15:06:21 -08:00
Alexander Morozov 0d167eb54d Merge pull request #18103 from crosbymichael/image-link 
Remove alt from markdown image
Upstream-commit: 0d98e2470fd985f3c113f44a93084d87e1a167f9
Component: engine
 2015-11-19 14:09:43 -08:00
Alexander Morozov 3221274c6e Merge pull request #18084 from wenchma/18054_exec_start_fix 
Update docs and test of exec create api return codes
Upstream-commit: 8e6e38990cb09eca2575263240d45a2a55db292e
Component: engine
 2015-11-19 13:51:46 -08:00
Alexander Morozov 27b2c588e8 Merge pull request #18076 from rhvgoyal/unmount-recursive 
Unmount recursively to unmount volumes
Upstream-commit: 24fb3659dfe1b4f4dfa4592699fb53d0868a95fe
Component: engine
 2015-11-19 13:46:48 -08:00
Alexander Morozov fd8d0f506e Merge pull request #17908 from calavera/carry_17059 
[Carry 17059] allow filtering containers by any status
Upstream-commit: 37f64ded44249fb174ba1797d6f6183575375300
Component: engine
 2015-11-19 13:24:43 -08:00
Alexander Morozov 92c9b9e9d4 Use fs cgroups by default 
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 419fd7449fe1a984f582731fcd4d9455000846b0
Component: engine
 2015-11-18 16:16:13 -08:00
Alexander Morozov 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
Alexander Morozov 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
Alexander Morozov 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
Alexander Morozov 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
Alexander Morozov 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
Alexander Morozov 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
Alexander Morozov 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
Alexander Morozov 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
Alexander Morozov 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
Alexander Morozov 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
Alexander Morozov 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
Alexander Morozov 07479c944e Merge pull request #16452 from rhatdan/btrfs-selinux 
Relabel BTRFS Content on container Creation
Upstream-commit: 4dda67b8014e71508e992c736febc5c45c53c095
Component: engine
 2015-11-17 11:03:40 -08:00
Alexander Morozov 22f6a379ae Merge pull request #17300 from kunalkushwaha/plugin-info 
Patch for Plugin drivers in docker info 
Upstream-commit: f18d5da6a7d148581f8de041ada62b1724839957
Component: engine
 2015-11-17 10:46:29 -08:00
Alexander Morozov 18b7d28382 Merge pull request #18014 from calavera/make_normalize_local_name_local 
Make NormalizeLocalName to not reach the network to normalize names.
Upstream-commit: e55274e3fe44f8f793443c9c689c1be77fe94f7f
Component: engine
 2015-11-17 10:23:41 -08:00
Alexander Morozov 820dd65e7d Merge pull request #17999 from tianon/linkmode-external 
Remove "-linkmode external"
Upstream-commit: 71f422435ed0ea645355f1375e2a778822416302
Component: engine
 2015-11-17 08:33:32 -08:00
Alexander Morozov a7857ff3b0 Remove cgroups mounting in dind 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 81aa1b507f51901eafcfaad70a656da376cf937d
Component: engine
 2015-11-16 17:10:53 -08:00
Alexander Morozov eb219a3ce5 Use /usr/lib/os-release if /etc/os-release is missing. 
As per os-release spec, /usr/lib/os-release file should be tried if
/etc/os-release is missing.

http://www.freedesktop.org/software/systemd/man/os-release.html

Thanks James Hunt <james.o.hunt@intel.com> and
Dimitri John Ledkov <dimitri.j.ledkov@intel.com> for contribution.

Close #17174

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 292a15e40a7201801fb9b0abd81175fd0a09a814
Component: engine
 2015-11-16 16:21:31 -08:00
Alexander Morozov c14625645c graph/graph.go: simplify appending to slice in map in byParent 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 25b37e2f0481e5e71e0c9c89827823affd50dd77
Component: engine
 2015-11-16 12:02:35 -08:00
Alexander Morozov cbf9321ca8 Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels 
Allow configurable metadata for Splunk log driver
Upstream-commit: a3065fa48f889ef438a7d7339ebc8fe01aca10dd
Component: engine
 2015-11-16 10:11:27 -08:00
Alexander Morozov 42d5166bfc Merge pull request #17758 from rhatdan/dynbinary 
Since default is dynbinary we should test with dynbinary
Upstream-commit: fb77b822ad2bb5d097ebd19a6ad4825b967a52ab
Component: engine
 2015-11-14 10:54:03 -08:00
Alexander Morozov 0192144f1d Merge pull request #17503 from mikebrow/fix-for-rmi-id-old-local-repositories 
putting in support for rmi id for legacy docker.io/name images in loc…
Upstream-commit: 9b307fe369884220fdbd3540562ede9050754e6b
Component: engine
 2015-11-13 16:22:30 -08:00
Alexander Morozov 5113a5250e Merge pull request #17980 from Microsoft/jjh/configuresysinit 
Remove uncalled configureSysInit
Upstream-commit: 5e2d4aaec22cd09e823ee976202515ac992dec20
Component: engine
 2015-11-13 14:30:03 -08:00
Alexander Morozov aac6b83468 Merge pull request #17090 from duglin/dockerignoreWildcards 
Support multi-dir wildcards in .dockerignore
Upstream-commit: f5e318a17b8bd3126281add5e82dfb09be5b8f11
Component: engine
 2015-11-13 14:29:34 -08:00
Alexander Morozov d89963cfd4 Merge pull request #16920 from mountkin/fix-attach-test 
fix the flaws in the test of the attach API
Upstream-commit: 4302c14a647570ec4e037ecacc920e59fdeec41a
Component: engine
 2015-11-13 12:05:22 -08:00
Alexander Morozov 3898bf4aaf Merge pull request #17615 from WeiZhang555/17404-net-inspect-name 
Include container names in `network inspect`
Upstream-commit: a4acb1db4ae899e5b331b4b2724bda990e6f1371
Component: engine
 2015-11-13 11:54:59 -08:00
Alexander Morozov 1a8e0677b9 Merge pull request #17417 from cpuguy83/15815_add_log_file_poller 
Fallback to file polling for jsonlog reader on err
Upstream-commit: 42fa8e31284c76f485bed81ed2e1327d60e5cb13
Component: engine
 2015-11-13 11:49:54 -08:00
Alexander Morozov e628862038 Merge pull request #16873 from coolljt0725/expand_docker_info 
Add more cgroup config to docker info
Upstream-commit: cccf6749431b5055e01f824f1d479ab517e1f812
Component: engine
 2015-11-13 09:37:06 -08:00