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
Michael Crosby a7727691d8 Update libcontainer to 3d8a20bb772defc28c355534d83 
Fixes #14203

This bump fixes the issue of having the container's pipes connection
reset by peer because of using the json.Encoder and having a \n added to
the output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7b5896702bd2951541af27925620172edb5d3505
Component: engine
 2016-01-26 15:00:07 -08:00
Michael Crosby 0bed041a45 Move tar copy-up for tmpfs mounts 
We cannot rely on the tar command for this type of operation because tar
versions, flags, and functionality can very from distro to distro.
Since this is in the container execution path it is not safe to have
this as a dependency from dockers POV where the user cannot change the
fact that docker is adding these pre and post mount commands.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ae8ec4860e68e945cf6b2c157fa4e243c35c54a5
Component: engine
 2016-01-26 14:00:39 -08:00
Michael Crosby 31eb5171fa Move tty set and restore to caller 
Fixes #19506

This fixes the issue of errors on create and the tty not being able to
be restored to its previous state because of a race where it was
in the hijack goroutine.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a1eb6029cc4e4ccd820b0aac147a6121f1967ba2
Component: engine
 2016-01-20 13:32:19 -08:00
Michael Crosby 7331395789 Update libcontainer to 47e3f834d73e76bc2a6a585b48d 
This adds a fix for the resource struct in the cgroups type and seccomp
IsEnabled function

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5f73ab89523d240c61d8e745bc106232891b46f7
Component: engine
 2016-01-19 15:34:08 -08:00
Michael Crosby 5dc0139c60 Merge pull request #18840 from aaronlehmann/trust-messages 
Send push information to trust code out-of-band
Upstream-commit: 2892de760f412360c5effef9cfc346f2d92eaa4c
Component: engine
 2016-01-08 16:56:57 -08:00
Michael Crosby 8334f715ad Merge pull request #19199 from crosbymichael/migrate-errors 
Fixed migrate defect, allow migrate the empty directory
Upstream-commit: 0a002f4ba813305a16f4ffb21488865601f0f18e
Component: engine
 2016-01-08 16:37:57 -08:00
Michael Crosby 3fbd578989 Merge pull request #19175 from cpuguy83/18670_copy_data_for_named_volumes 
On create, copy image data for named volumes.
Upstream-commit: e26974e20b7e431b7c6e5a0dd4b7fe1b0127271f
Component: engine
 2016-01-08 11:33:40 -08:00
Michael Crosby 966533e9d7 Merge pull request #18399 from tonistiigi/migration-optimization 
Migration optimizations
Upstream-commit: 5aae5a5fae39cff15f5e92cfe1f80c1c5ef019d9
Component: engine
 2016-01-05 10:11:56 -08:00
Michael Crosby 89d18d78c9 Merge pull request #18208 from cpuguy83/restart_links 
Daemon Restart: attempt to wait for container deps
Upstream-commit: 04234bd16a463af3b5e093ef180351d7b54b6a35
Component: engine
 2016-01-04 14:36:00 -08:00
Michael Crosby 287778e637 Merge pull request #18402 from Microsoft/jjh/timeout 
Windows CI Fix: Timeout change
Upstream-commit: 2856a3048238d7a746d57028e48ea2489555e6e5
Component: engine
 2015-12-03 14:33:09 -08:00
Michael Crosby 5fc75a60ac Merge pull request #18347 from tiborvass/container_package 
Move Container to its own package (carry of 17969)
Upstream-commit: 168b490062aed36bf95426d9d66dcf5703842016
Component: engine
 2015-12-03 14:10:16 -08:00
Michael Crosby 60f58722cf Merge pull request #18213 from crawford/18212-fix-api-server 
Revert "Return listenbuffer behavior"
Upstream-commit: 34228586530fb3c51c4faa8ec73b9e15926893ea
Component: engine
 2015-11-25 10:49:31 -08:00
Michael Crosby 375b6e5bf3 Move arm info to project/ 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ffd36a14e7a2d0eef2e3b20b42045ae1c6c90957
Component: engine
 2015-11-23 13:54:17 -08:00
Michael Crosby 899956d9a0 Remove scaleway info 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2ec186377eef75efafb58c56ea4ebb673e60b9fd
Component: engine
 2015-11-23 13:53:54 -08:00
Michael Crosby 9fb90e10c1 Merge pull request #18134 from hypriot/17802-fix-integration-tests-for-arm 
Increase timeouts to fix integration-cli tests on ARM
Upstream-commit: 048280ca42e5855bfe7850f4f30843d2ad675861
Component: engine
 2015-11-20 15:05:26 -08:00
Michael Crosby ef86d50578 Merge pull request #18131 from hypriot/18124-use-startwithbusybox 
Fix integration-cli tests 
Upstream-commit: 8022e6292ed8e4676fdc65ad80ee3b68629493e7
Component: engine
 2015-11-20 14:20:12 -08:00
Michael Crosby 2b61f40d62 Merge pull request #18051 from calavera/extract_streams 
Extract StreamConfig struct out of the daemon package.
Upstream-commit: b5c507750f2c7f616ed94ad502f5f6904cad4eac
Component: engine
 2015-11-20 13:45:13 -08:00
Michael Crosby bbfff7fedd Merge pull request #18067 from cpuguy83/fix_pull_space_test 
Make TestDaemonNoSpaceleftOnDeviceError linux only
Upstream-commit: 6e49343202d77ef103eb2b4e33658b8bb18d7716
Component: engine
 2015-11-20 10:51:21 -08:00
Michael Crosby 5832a3ebde Merge pull request #17005 from mavenugo/restart 
Adding a restart test to make sure #16887 doesnt happens again
Upstream-commit: ee03a05595e6ecd373553d33a01aff4d18bcc63c
Component: engine
 2015-11-19 17:01:34 -08:00
Michael Crosby e1191bf537 Merge pull request #17459 from brahmaroutu/Power_Z_CI 
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
Upstream-commit: 249b3a9479048bcec8da0666c2e224dddcfc3de8
Component: engine
 2015-11-19 15:50:07 -08:00
Michael Crosby e5f9171396 Remove alt from markdown image 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 38a58a4a1c92e6efa4bcf2a809883cef8c391f05
Component: engine
 2015-11-19 14:06:16 -08:00
Michael Crosby c99e76c95d Merge pull request #18102 from mavenugo/sb_ep_race 
Fixed an endpoint delete issue with a possible stale sbox
Upstream-commit: da969aac5ab0b1376615ed54fb54a909c98f05f8
Component: engine
 2015-11-19 13:55:28 -08:00
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby bab21d6431 Merge pull request #17859 from liusdu/remove-rebundent 
remove unnecessary logs from daemon
Upstream-commit: 1f53bf90972141bc6f5888fb3520dbc68ff9ed14
Component: engine
 2015-11-13 16:45:30 -08:00
Michael Crosby c61ecf4a61 Merge pull request #17976 from Microsoft/jjh/store-test-unit 
Windows: Pass store test-unit
Upstream-commit: 7e0a5398af780669684b3c879542df0cc9126114
Component: engine
 2015-11-13 16:26:17 -08:00
Michael Crosby b80faeb568 Merge pull request #17977 from Microsoft/jjh/archivewindowscomment 
Windows: Fixes comment in archive_windows.go
Upstream-commit: 439633cee63dd77c45348b57b4ec7e1332c6206f
Component: engine
 2015-11-13 16:00:14 -08:00
Michael Crosby eeed6c7d1f Merge pull request #17978 from Microsoft/jjh/removevolumecheck 
Windows: Remove check for volume support
Upstream-commit: 28612c558729a01f6d57d648436913a7055bbc14
Component: engine
 2015-11-13 15:59:41 -08:00
Michael Crosby 040ce59c2f Merge pull request #17979 from Microsoft/jjh/tidytodowindows 
Remove 'TODO Windows' unnecessary comment
Upstream-commit: 58244392e5e42bfa13114ff2cec60ef176ec173f
Component: engine
 2015-11-13 15:59:06 -08:00
Michael Crosby c7dd3d34fc Merge pull request #17918 from anusha-ragunathan/fsMagic 
Include xfsprogs in build environment.
Upstream-commit: b664a8825ea20a729f14a49dcc0fc51ca4e01d8b
Component: engine
 2015-11-11 15:43:52 -08:00
Michael Crosby eb4200c1ba Merge pull request #17638 from calavera/move_net_stats_collector 
Make the stats collector to collect network stats.
Upstream-commit: aff8bd178c048780fa221e65a9dcce28b9c96df9
Component: engine
 2015-11-03 10:31:40 -08:00
Michael Crosby 73a0603e8b Don't set mem soft limit if not specifiecd 
You cannot do this for individual cgroups for all the containers.  Only
set the reservation if the user requested it.  The error you will
receive is an EINTVAL when you try to set a large limit like we were in
the memory limit.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ecb87ed0a5128a3d9ab3b0a620463b7b56e82bab
Component: engine
 2015-10-30 10:34:01 -07:00
Michael Crosby 828e7e6368 Merge pull request #16412 from Microsoft/10662-hyper-v-containers 
Windows [TP4]: Adds support for Hyper-V Containers
Upstream-commit: aadae4b503fbf21db788e12785cdc8844679bebc
Component: engine
 2015-10-30 09:34:16 -07:00
Michael Crosby c164ea0c2b Merge pull request #17374 from brahmaroutu/fix_gccgo_ci 
GCCGO requires more memory and time to start containers, fixing GCCGO…
Upstream-commit: 8173acca9530dc3ff090f6025e6940e3f1f6f116
Component: engine
 2015-10-26 13:33:59 -07:00
Michael Crosby d358a1b7cc Merge pull request #17313 from calavera/version_exec_json_check 
Version exec json check.
Upstream-commit: 5cf028d3ddc8808bbd3ff710cdd82bf4a04042a2
Component: engine
 2015-10-26 13:32:32 -07:00
Michael Crosby 37bb29c370 Merge pull request #17368 from HuKeping/update-test 
Update docker_cli_build_unix_test
Upstream-commit: 74a881c9e4e4010d79799baec751e278864b5509
Component: engine
 2015-10-26 13:21:31 -07:00
Michael Crosby a78999351d Merge pull request #17284 from calavera/buffer_inspect_template 
Fail when there is an error executing an inspect template.
Upstream-commit: 21aecf62a0064ead695e338f5dfcf8ecab5069f4
Component: engine
 2015-10-22 17:06:16 -07:00
Michael Crosby 1dd7cd942b Merge pull request #16989 from tiborvass/bump-libcontainer-for-docker-1.9 
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
Upstream-commit: 3ad9cc996a3daf0c3f05972141bdfc6d8126d705
Component: engine
 2015-10-13 16:56:19 -07:00
Michael Crosby 00439678a1 Merge pull request #16996 from jfrazelle/cleanup-no-reprepro 
update release-deb from the reprepro stuff we don't use
Upstream-commit: 6ae6371d113737b383b389d7ce54b6692e99f9c4
Component: engine
 2015-10-13 15:46:58 -07:00
Michael Crosby 8898de5ddc Merge pull request #16951 from icecrime/maintainers_rm_fred 
Remove fredlf from MAINTAINERS
Upstream-commit: 8a71e005b47024c5dc7450eaae1005c38b671d5c
Component: engine
 2015-10-12 11:07:50 -07:00
Michael Crosby 6ec1436aba Merge pull request #16152 from chlunde/devmapper-mount-flags 
Use pkg/mount to support more flags in dm.mountopt
Upstream-commit: 6d9a84bcd04cd178033309859eb7bf386a8db85d
Component: engine
 2015-10-08 16:02:50 -07:00
Michael Crosby cb64a89077 Fix windows cross compile with new netlink 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7d8b5fc3aa291e1126f43157a26b9b021023d76f
Component: engine
 2015-09-24 15:01:03 -07:00
Michael Crosby 18dfcf4e5a Update libcontainer to aac9179bbadbf958054ce97ab36 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 189d2c79858d08a4cf3454bd7367989a005a4e3b
Component: engine
 2015-09-24 15:00:31 -07:00
Michael Crosby 80b964fca7 Update CAP_ prefix for new spec format 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f6064cb42b7016641a4823ebd49032edff54befa
Component: engine
 2015-09-24 15:00:30 -07:00
Michael Crosby d9f4d6c1cc Fix netlink dependency with new pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d0fdc3b5dfa951870f4a7c0a08dea8c1bc68a31b
Component: engine
 2015-09-24 15:00:30 -07:00
Michael Crosby 63decb3521 Bump libcontainer to 08b5415ffa3769ff7c1d2f673f613 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6bd3e6357c77f38edd905491837f31f064c70d08
Component: engine
 2015-09-24 15:00:30 -07:00
Michael Crosby 8ebc68df59 Merge pull request #16018 from surya-shodan/master 
Typo in README.md
Upstream-commit: 6f5eb78519442bc26680e8e5406bbd788a395815
Component: engine
 2015-09-03 11:57:06 -07:00
Michael Crosby f8d3e36feb Merge pull request #16036 from Microsoft/10662-httpdirectory 
Windows: Fix HTTP download directory
Upstream-commit: 8258996cf28a2e25c6c765b48acf9ad889996827
Component: engine
 2015-09-03 11:54:53 -07:00
Michael Crosby 2f2b355be9 Merge pull request #16038 from aboch/sbx 
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
Upstream-commit: 288275ab60c049fa644f1ce5d36c0c005e8dd02c
Component: engine
 2015-09-03 11:48:02 -07:00
Michael Crosby 58853bb568 Add aufs data structure for added mount information 
This adds a data struct in the aufs driver for including more
information about active mounts along with their reference count.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 20bb0655356900fcd94756afc5228f23e0a40b1f
Component: engine
 2015-08-26 16:38:13 -07:00
Michael Crosby 2bffc18a77 Add LXC built in support deprecation notice 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 06f6c0c7e50ea0df588d1d873783f326c23f195a
Component: engine
 2015-08-03 14:54:42 -07:00
Michael Crosby f32577e8c4 Merge pull request #15201 from moul/names-generator-bin 
pkg/namesgenerator: add a 'names-generator' binary
Upstream-commit: 0659ceb0d0a27d23d727d8d8e3428f59aa039d37
Component: engine
 2015-07-31 13:09:02 -04:00
Michael Crosby 8461105dc9 Don't mount /proc as ro 
This caused a regression with LSM labeling.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: bfc51cf6605ebcf7a4ec791fb0f3b5ae7b05c6fd
Component: engine
 2015-07-30 10:57:50 -07:00
Michael Crosby 254f9e966b Merge pull request #15142 from calavera/add_field_comment_back 
Add MemorySwappiness comment back.
Upstream-commit: 887882c2b6856eb06baa3ccefd5c3bc7e2a6feed
Component: engine
 2015-07-29 16:51:49 -07:00
Michael Crosby e075bafeec Merge pull request #15039 from jlhawn/fix_build_context_is_symlink 
[api/client] Fix build when context dir is symlink
Upstream-commit: bdc55be9b49bd4cdcc9373e2eb847b133532cedc
Component: engine
 2015-07-27 15:11:36 -07:00
Michael Crosby 2371d5e9ce Merge pull request #13312 from hqhq/hq_enable_cgroupfs 
Add cgroup bind mount by default
Upstream-commit: 1dd2fda394923ab6c64d58d7d3b91043f16b72c2
Component: engine
 2015-07-10 10:45:05 -07:00
Michael Crosby 73ee9f3650 Merge pull request #14527 from duglin/MoreExecTests 
More extensive testing of new GC of execs
Upstream-commit: c4b85baf3def6d5348083b70b2349740bdfeb20c
Component: engine
 2015-07-10 10:42:28 -07:00
Michael Crosby 92adaadd4b Merge pull request #14505 from kostickm/12905-port-container-attach-tests 
Port POST container attach tests
Upstream-commit: e64af7a70ea1220d08bc2d11ad0d3974ee043aa0
Component: engine
 2015-07-09 16:27:03 -07:00
Michael Crosby e0ffc7b501 Use mark and sweep for exec command removal 
This takes the final removal for exec commands in two steps.  The first
GC tick will mark the exec commands for removal and then the second tick
will remove the config from the daemon.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 34ab8c432691934745d66ee94ff4aec1120518e0
Component: engine
 2015-07-09 14:51:10 -07:00
Michael Crosby 6d71e61742 Add GC loop to clean exec command refs on daemon 
This adds an event loop for running a GC cleanup for exec command
references that are on the daemon.  These cannot be cleaned up
immediately because processes may need to get the exit status of the
exec command but it should not grow out of bounds.  The loop is set to a
default 5 minute interval to perform cleanup.

It should be safe to perform this cleanup because unless the clients are
remembering the exec id of the process they launched they can query for
the status and see that it has exited.  If they don't save the exec id
they will have to do an inspect on the container for all exec instances
and anything that is not live inside that container will not be returned
in the container inspect.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5f017bba48e5c763157e1b35a5edea64cc41fc6a
Component: engine
 2015-07-08 13:47:59 -07:00
Michael Crosby 51dfe1d73a Remove exec config from container after exit 
This removes the exec config from the container after the command exits
so that dead exec commands are not displayed in the container inspect.
The commands are still kept on the daemon so that when you inspect the
exec command, not the container, you are still able to get it's exit
status.

This also changes the ProcessConfig to a pointer.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 04c9f86bdcf9f42deb09df76922a8c61205721a2
Component: engine
 2015-07-08 10:55:42 -07:00
Michael Crosby 33df474b64 Merge pull request #13835 from cpuguy83/gen-prc 
generate plugin clients via template
Upstream-commit: 806b3fa14529a97dfad8fad8ed2a21b26de94492
Component: engine
 2015-07-07 17:17:39 -07:00
Michael Crosby 237be75b88 Merge pull request #13866 from brahmaroutu/runOOM_13766 
RunOOM test should check to see if Oom Control is enabled
Upstream-commit: a5283d2ff3546c1fe946aa8a1ddc076b08d5700c
Component: engine
 2015-07-07 16:21:46 -07:00
Michael Crosby 6d7c94a01e Merge pull request #14398 from ankushagarwal/gitignore-iml 
Removing .idea from .gitignore
Upstream-commit: a8f8748f7aed62c1633bb8fbaeca6fb7c929033d
Component: engine
 2015-07-07 12:10:54 -07:00
Michael Crosby 9752456dbb Merge pull request #14094 from rghv/master 
Added entries of a few ancient Indian mathematicians who did cool things centuries ago.
Upstream-commit: bfc5966d0b787a059320c927d4cf530e301667b7
Component: engine
 2015-07-07 12:03:28 -07:00
Michael Crosby 0b57b151dd Merge pull request #14421 from dmcgowan/fix-duplicate-layers 
Fix duplicate layers in manifest
Upstream-commit: cd72c7f3bb43a39d68baec776f200d20a645a48c
Component: engine
 2015-07-07 10:50:45 -07:00
Michael Crosby 2168e591ab Always attach STDIN if -i,--interactive is specified 
There is no reason to error out or not do what the user expects when -i
is specified on the cli.  We should always attach to the stdin of the
container in this situation.

Closes #14390

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 691b2851f7b745d225a2698b964cf60f55a0c4d7
Component: engine
 2015-07-06 15:24:23 -07:00
Michael Crosby 972f3a5da2 Merge pull request #13893 from mrunalp/update_libcontainer 
Updates libcontainer to v2.2.1
Upstream-commit: 010470dd536b2fcd01392c3630131ccf1bc79985
Component: engine
 2015-06-17 10:47:49 -07:00
Michael Crosby 9ac0ec70e6 Get Mtu from default route 
If no Mtu value is provided to the docker daemon, get the mtu from the
default route's interface.  If there is no default route, default to a
mtu of 1500.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ff4e58ff560d864432261a68502a8a5543145fdf
Component: engine
 2015-06-15 16:33:02 -07:00
Michael Crosby 8b238203a5 Merge pull request #13942 from calavera/fix_unshare_mount_regression 
Fix regression bind mounting shared.
Upstream-commit: 3f11e05db2c2efdac0455b693efdacc6fce1ab62
Component: engine
 2015-06-15 11:25:35 -07:00
Michael Crosby 8931d825f6 Merge pull request #13344 from hqhq/hq_fix_arm64_test 
Fix unit-test build error on ARM64
Upstream-commit: 39bf57e085d3632b2f03b26a4b9dc900d88b164c
Component: engine
 2015-06-12 17:11:18 -07:00
Michael Crosby ebc23891b1 Revert shared container rootfs 
This is breaking various setups where the host's rootfs is mount shared
correctly and breaks live migration with bind mounts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c9d71317be5fd13ba544a2699442a40ccf2cc3cc
Component: engine
 2015-06-10 11:29:27 -07:00
Michael Crosby 0ae1820eeb Merge pull request #13784 from mrjana/cnm_integ 
libnetwork: Add garbage collection trigger
Upstream-commit: 4750e1f77ef1f42f8b826f7314ec4c2b3f7a4f34
Component: engine
 2015-06-09 17:24:30 -07:00
Michael Crosby fda82af70c Merge pull request #13800 from eolamey/13799-fix-docs-url-in-systemd-service-file 
Fix docs URL in systemd service file.
Upstream-commit: b099eb796a54276ea6585d9647b274d296a83aed
Component: engine
 2015-06-08 09:36:36 -07:00
Michael Crosby 6f075808ca Merge pull request #13728 from calavera/copy_old_volume_content 
Migrate data from old vfs paths to new local volumes path.
Upstream-commit: b26428257f211f21f0f93d27d0ea74531cda9047
Component: engine
 2015-06-04 11:14:34 -07:00
Michael Crosby 376792022a Fix nat integration tests 
This removes complexity of current implementation and makes the test
correct and assert the right things.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4f4209788378e580247d4baff65ae5b58afac4ba
Component: engine
 2015-06-02 18:21:16 -07:00
Michael Crosby ee469d3fb9 Merge pull request #13391 from jfrazelle/add-security-maintainers 
Add diogo and nathan as security maintainers.
Upstream-commit: ed9ad0be6d511c70686b7793cb5e6f6eefcf3969
Component: engine
 2015-05-22 10:12:04 -07:00
Michael Crosby 8e905a0abb Merge pull request #13371 from theadactyl/patch-2 
Add theadactyl as community manager
Upstream-commit: 523d2f6a04d59883d0a45c177209e04729a4daa6
Component: engine
 2015-05-21 11:06:38 -07:00
Michael Crosby 2b5ebf7133 Merge pull request #13282 from duglin/RemoveBash 
Remove use of 'bash' from our tests
Upstream-commit: aac645ae047601fed1550c9d59d7c8ea978203b0
Component: engine
 2015-05-18 13:06:21 -07:00
Michael Crosby 073f78693b Merge pull request #13204 from chenhanxiao/gitignore 
gitignore: add *.rej
Upstream-commit: 785ba790fbd6082052cec1704fe8e7e09ba89a4d
Component: engine
 2015-05-18 11:51:06 -07:00
Michael Crosby edeb4ed190 Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt 
Fix incorrect document storage-opt
Upstream-commit: 70e9e4bf9f7901137483fb4c9635d8d3cf686328
Component: engine
 2015-05-18 11:35:01 -07:00
Michael Crosby 4ec571c859 Merge pull request #13295 from aimxhaisse/13294-mflag-panic 
Fix panic when using default-initialized FlagSet
Upstream-commit: fc4f3e5650493faed1e89bcf9a2a1a61c13dcd34
Component: engine
 2015-05-18 11:27:12 -07:00
Michael Crosby b1c2bb01ee Merge pull request #13280 from runcom/test-clean-from-inspect 
Clean tests from not needed inspect call
Upstream-commit: aca4ae8c90dc4ae87dec720ed58a69bec6dabab6
Component: engine
 2015-05-18 11:06:18 -07:00
Michael Crosby ce9a1d34cc Merge pull request #13306 from ahmetalpbalkan/logopts-context 
Pass --log-opts map to logdrivers
Upstream-commit: cbc122e8a77493c521f23e1d9c1ba49d9108467e
Component: engine
 2015-05-18 10:58:17 -07:00
Michael Crosby 07c8ebe4df Merge pull request #13222 from calavera/plugins_infra 
Remote plugins plumbing.
Upstream-commit: 115b11ae69d107e163034a1cfa9fd4d8e33ff00f
Component: engine
 2015-05-15 16:37:55 -07:00
Michael Crosby cb0887401b Merge pull request #13236 from vieux/revert_time_change 
Revert "Fix inconsistent date formats in API"
Upstream-commit: 520955b1cfaa65dbb4609c414c8d913327ee4520
Component: engine
 2015-05-15 10:32:03 -07:00
Michael Crosby 2df1795660 Update test for /sys mounting 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 677d76cd4aadf7514a3ba4e6761880fc3817f573
Component: engine
 2015-05-13 15:02:53 -07:00
Michael Crosby eaedb9b85a Update libcontainer to a37b2a4f152e2a1c9de596f54c0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 87c35d0e0af930d1c7ac03f852287348f7f9d240
Component: engine
 2015-05-13 13:55:26 -07:00
Michael Crosby f72477cc8d Bump to version 1.6.2 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	VERSION
Upstream-commit: cec64ebef849dade38c6ac29fc077f30f9d872d0
Component: engine
 2015-05-13 13:51:39 -07:00
Michael Crosby 2f381e17ae Merge pull request #13192 from tianon/fix-bad-vendor.sh-rebase 
Fix mangled hack/vendor.sh rebase
Upstream-commit: c46c8f4e4082552dd9ea003aaf71fbf52ba983a1
Component: engine
 2015-05-13 12:02:07 -07:00