Commit Graph

11736 Commits

Author SHA1 Message Date
03d1b8dbe7 Implement client side display for stats
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2640a10bca29c4a4199c906a26f658aac8a68dc2
Component: engine
2015-01-20 20:21:46 -08:00
947efff180 Implement container stats collection in daemon
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 65f58e2a742205c9e8470b360bd439642a5c8211
Component: engine
2015-01-20 20:21:46 -08:00
ff8b2a1301 Merge pull request #10122 from dqminh/execin-wait-cgroup
ExecIn process should wait for the parent signal before forking
Upstream-commit: 5f5e02d22c2bd9793e35eb982592c37a65f37674
Component: engine
2015-01-20 18:02:14 -08:00
f182adf280 Merge pull request #10205 from ashahab-altiscale/9875-non-privileged-proc-sys
use lxc.auto.mount to ensure proc and sys are readonly
Upstream-commit: cac17f990bcdad8ef1f69da29e73f41df84b8caa
Component: engine
2015-01-20 17:54:56 -08:00
f39e23250f Merge pull request #10173 from SvenDowideit/release-1.5-combined-documentation
An initial quick import of documentation from Compose, Machine and Swarm
Upstream-commit: 620b58068f7c4e381254ad4c17cc4c7e0ca63a9b
Component: engine
2015-01-20 17:08:55 -08:00
f11f701e04 Merge pull request #10222 from vbatts/vbatts-dm_flag_and_output
dm flag and output
Upstream-commit: 9b2afa04f8ab491d56614835de09eb0880250309
Component: engine
2015-01-20 18:45:43 -05:00
8848880ea1 Merge pull request #10147 from cpuguy83/9629_volumes-from_unregistered-container
fix Bind-mounts not properly registering after daemon restart
Upstream-commit: cc66fa35431330a232400fdab1e374ffc87c61f2
Component: engine
2015-01-20 15:37:55 -08:00
1c8677b886 Merge pull request #10206 from jfrazelle/add-docs-memory-swap
Add docs for `--memory-swap`.
Upstream-commit: a276706719a9c2d437c643281639ffa80daf1fdd
Component: engine
2015-01-20 18:20:13 -05:00
d625d83871 Fix volume ref restore process
Fixes #9629 #9768

A couple of issues:

1) Volume config is not restored if we couldn't find it with the graph
driver, but bind-mounts would never be found by the graph driver since
they aren't in that dir

2) container volumes were only being restored if they were found in the
volumes repo, but volumes created by old daemons wouldn't be in the
repo until the container is at least started.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e744b0dcbacd5e226fd79aba5a2e83f432d2d13f
Component: engine
2015-01-20 15:54:56 -05:00
a150249a50 Merge pull request #10223 from tianon/go1.3-TestBuildWithTabs
Update TestBuildWithTabs to allow for the "\t"-equivalent "\u0009" (for Go 1.3 support)
Upstream-commit: 9305020d9f5471c15666cf7203dd1c0734987c72
Component: engine
2015-01-20 11:37:43 -08:00
31756f48b3 Merge pull request #9970 from shishir-a412ed/docker_load_issue
Implementation of docker load command, load the tar ball directly into /var/lib/docker/graph
Upstream-commit: 092d52281d20e3456677ac11d781abf1cd0bdd8f
Component: engine
2015-01-20 14:15:41 -05:00
c34a3e1187 Update TestBuildWithTabs to allow for the "\t"-equivalent "\u0009" (for Go 1.3 support)
This is literally the only failing test on Go 1.3.3: 🎉
```
--- FAIL: TestBuildWithTabs (0.43 seconds)
	docker_cli_build_test.go:4307: Missing tabs.
		Got:["/bin/sh","-c","echo\u0009one\u0009\u0009two"]
		Exp:["/bin/sh","-c","echo\tone\t\ttwo"]
```

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 142369456d2469a06e3860bdfe13169a908a3707
Component: engine
2015-01-20 12:11:59 -07:00
ca9b7e2a12 Merge pull request #10193 from vbatts/vbatts-dm_logging
devmapper: initialize log levels
Upstream-commit: fa7af79885f43bdbd0d13b6c8e1bdbab7b2cc722
Component: engine
2015-01-20 14:06:01 -05:00
8d334a8cc4 test that execin cgroups match container cgroups
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Upstream-commit: 9462dbb242449b126ff473d081cec04afaa936d2
Component: engine
2015-01-20 13:51:15 -05:00
85aed8db6e devmapper: initialize log levels
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 0c8be9da3763d86c2a6e847e1667410056d6071d
Component: engine
2015-01-20 13:31:19 -05:00
3757727dfa devicemapper: define device-mapper log levels
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: a687e8d86ba07ebb42d988b6e13102569b60e673
Component: engine
2015-01-20 13:31:12 -05:00
dbf7d610b8 Merge pull request #10005 from estesp/fix-localhost-nameserver-cleanup
Clean up localhost resolv logic and add IPv6 support to regexp
Upstream-commit: e9d3e237e5cffef0dfcd4949c31959cd25863f3f
Component: engine
2015-01-20 10:30:06 -08:00
243df800ea Merge pull request #10155 from tianon/netgo-take-three
Let's try fixing "netgo" again
Upstream-commit: b2fe1b3dd952daaadccf9951c269af84030e8873
Component: engine
2015-01-20 09:45:42 -08:00
ea711cace6 Merge pull request #10204 from vbatts/vbatts-dm_info_docs
devmapper: some explination of `docker info`
Upstream-commit: 06da161aeeb6b458cac2db44db6e3af59d091402
Component: engine
2015-01-20 09:41:25 -05:00
cad4508ee5 Merge pull request #10189 from crosbymichael/update-libcontainer-jan16
Update to libcontainer eb74393a3d2daeafbef4f5f27c0
Upstream-commit: 2feb2d07b6f98364a585d82af250d32664fd8df3
Component: engine
2015-01-19 19:33:40 -07:00
304cd59f67 Merge pull request #10135 from coolljt0725/update_link_docs
Update the docs for --link accept container id
Upstream-commit: e6a70a6f819c09f2d33b59adc7378f758349ae6d
Component: engine
2015-01-19 18:12:50 -08:00
73a96089ff Merge pull request #10190 from ashahab-altiscale/9875-lxc-run-links
LXC needs stdin for container to remain up
Upstream-commit: 7b48488c5641f092e111aa9d5562b368f7e66711
Component: engine
2015-01-19 17:13:37 -08:00
f4d05bcf4d Merge pull request #10124 from duglin/Issue10034
Add the list of possible values for --log-level to help text
Upstream-commit: 1efc940e6f547760e5e8f4648acb120ff19fdc58
Component: engine
2015-01-19 17:09:18 -08:00
829a93bca6 Merge pull request #10061 from brahmaroutu/env_ports_9900
Env Variables created for each of the ports in addition to env variables...
Upstream-commit: f49fb253753fa472e934935960c5818b443ee697
Component: engine
2015-01-19 16:56:47 -08:00
5e93ebec1e Clean up localhost resolv logic and add IPv6 support to regexp
Addresses #5811

This cleans up an error in the logic which removes localhost resolvers
from the host resolv.conf at container creation start time. Specifically
when the determination is made if any nameservers are left after
removing localhost resolvers, it was using a string match on the word
"nameserver", which could have been anywhere (including commented out)
leading to incorrect situations where no nameservers were left but the
default ones were not added.

This also adds some complexity to the regular expressions for finding
nameservers in general, as well as matching on localhost resolvers due
to the recent addition of IPv6 support.  Because of IPv6 support now
available in the Docker daemon, the resolvconf code is now aware of
IPv6 enable/disable state and uses that for both filter/cleaning of
nameservers as well as adding default Google DNS (IPv4 only vs. IPv4
and IPv6 if IPv6 enabled).  For all these changes, tests have been
added/strengthened to test these additional capabilities.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 93d51e5e971e001d80e9ffa863439f2d72215b5a
Component: engine
2015-01-19 19:35:55 -05:00
3a60e835c5 Add docs for --memory-swap.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7bb4b56cf98662ef5f1deb64bdf8a120490bc258
Component: engine
2015-01-19 16:17:58 -08:00
6d7d2d6f8c Merge pull request #10170 from thaJeztah/docs-note-environment-vars
Document that ENV vars are not automatically updated
Upstream-commit: 04d1b93fce4789ad186b4762d94629c11c79ffbe
Component: engine
2015-01-20 10:04:25 +10:00
9eb9d337ae Merge pull request #10175 from fossilet/patch-1
Add usage of port mapping for Boot2docker.
Upstream-commit: e08858a80dfd1d947a7cba5031febb6868256195
Component: engine
2015-01-20 10:03:32 +10:00
bfeba0bea3 Merge pull request #10192 from icecrime/9951_client_proxy_doc
Add documentation for HTTP proxies
Upstream-commit: 826e0beade7deecdae19322e93a417c6c4872822
Component: engine
2015-01-19 18:55:25 -05:00
1a5071a250 Merge pull request #9826 from icecrime/8318_whitespace_add_copy
Support whitespace in paths for ADD and COPY
Upstream-commit: 50ff27caa13b4c558b0ddc9f65297b6ef6eb119d
Component: engine
2015-01-19 18:37:53 -05:00
62c5f93e15 devmapper: some explination of docker info
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
Upstream-commit: a09a665d99c84be74ffff68a39dde83ad3c0d34a
Component: engine
2015-01-19 17:37:08 -05:00
279519e07d devicemapper: debug output specifics
moar information for the information gods

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 4cfe9df0a9c206c368a90f460fea8fab197265d9
Component: engine
2015-01-19 17:21:10 -05:00
2622e003cc devicemapper: define the fallback flag
DM_UDEV_DISABLE_LIBRARY_FALLBACK is disabled by most applications today
when using device-mapper, and ensuring that device-mapper is in sync
with udev. This flag instructs devicemapper to not fallback to creating
the device nodes itself. In the case of udev sync not being supported,
devicemapper will attempt to create the devices in a timely manner,
regardless of udev.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: dbb642b7fbdf42d3b401d610403ba58ebbde38d7
Component: engine
2015-01-19 17:06:53 -05:00
63795bba13 Merge pull request #10195 from vbatts/vbatts-dm_udev_sync
device-mapper udev sync
Upstream-commit: 2d61a62378a2aa9d0b05023e05d2632b596c61c4
Component: engine
2015-01-20 00:06:29 +02:00
1d078b8407 Merge pull request #9730 from cpuguy83/9709_fix_volumes_from_missing_container
Fix volumes-from re-applying on each start
Upstream-commit: 9b4cd01b21a2553c46d5735d827d7b0f570e6cad
Component: engine
2015-01-19 14:00:53 -08:00
8ae343ded1 devmapper: udev sync in docker info
now:

```
[...]
Storage Driver: devicemapper
 Pool Name: docker-253:2-5767172-pool
 [...]
 Udev Sync Supported: true
[...]
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: d2593546f9a234699cd0034cc6b97c748c10c93e
Component: engine
2015-01-19 16:28:02 -05:00
76f28ab081 Merge pull request #10128 from vieux/filters_image
Server-side restriction of allowed image filters
Upstream-commit: cb9db04fd72cf31b3df802fe19a0cff4cf682438
Component: engine
2015-01-19 13:24:03 -08:00
e54a5327c8 devmapper: udev sync on init
when initializing the devmapper driver, attempt to sync udev and device
mapper. If udev sync is not supported, print a warning. Eventually we'll
likely bail here to avoid unpredictable behavior for users.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 022e1232f84966c4b70a612bc35463ebb58e3137
Component: engine
2015-01-19 15:57:25 -05:00
b3b9656da1 devicemapper: dm_udev_get_sync_support
expose an api to call dm_udev_get_sync_support/dm_udev_set_sync_support

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 9c3380039e15f11fc07741edd4cbc0c7e5c490aa
Component: engine
2015-01-19 15:15:51 -05:00
72f0caa64c Implementation of docker load command: Untarr the incoming tar stream directly into /var/lib/docker/tmp without creating the tar ball
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 315260203c3a683fe7e93aa6c937128d38d52ae4
Component: engine
2015-01-19 15:09:02 -05:00
1e4478b6cf Let's try fixing "netgo" again
Since "go test" doesn't seem to support "-installsuffix" as quite the same perfect solution that "go build" is happy to let it be, let's just switch those crappy old "integration/" tests to use our separate static dockerinit binary so we don't have to worry about compiling the entire test harness statically. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 232d59baeb13778abc242a602ca434d83e1eb6e8
Component: engine
2015-01-19 12:48:25 -07:00
51e443fb29 Add documentation for HTTP proxies
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 3a1dbef8232ee4f58cbaf3a2776c27a4d5b04bc4
Component: engine
2015-01-19 11:23:31 -08:00
eeb5a0ad4a Merge pull request #9968 from HuKeping/master
log: Add restart policy name to the inspect information of container
Upstream-commit: 4c38045be1deed08bc1494261fd9a3e2812e67ad
Component: engine
2015-01-19 11:08:32 -08:00
b098aaedce Merge pull request #9784 from dmcgowan/v2-registry
Client Support for Docker Registry HTTP API V2
Upstream-commit: 8b95ad230e2ee76450ceb9a80aa8e942a56bb397
Component: engine
2015-01-19 10:46:38 -08:00
3f7b51a04e Merge pull request #10152 from ashahab-altiscale/9875-cap-add-all
SEND CAPABILITY IDS TO LXC
Upstream-commit: 979a4cdacdea48e401715ad887b43ee0b4bb513a
Component: engine
2015-01-19 10:46:22 -08:00
6a9f109b4d Update to libcontainer eb74393a3d2daeafbef4f5f27c0
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6b04d9342c3d76f5979850f93a4afd41afa33227
Component: engine
2015-01-19 10:37:31 -08:00
a9b7d25bb0 Merge pull request #10138 from ShockwaveNN/patch-1
fix link to introducion on 'Working with Docker Images' page
Upstream-commit: 27602f2a21732656180397cd4e30b9d246b75a0b
Component: engine
2015-01-19 10:53:15 -05:00
681db1e57f Merge pull request #10167 from bgazzera/master
There was a missing command to re-run the web container.
Upstream-commit: 6286c0711f2abc4a427ba4064b2a5f3d478c4034
Component: engine
2015-01-19 10:50:08 -05:00
b9a7e1b9ee Fix typo.
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com>
Upstream-commit: 1b4a926377524455653019c772355bd71a148045
Component: engine
2015-01-19 18:02:23 +08:00
adb4e7d83e Add usage of port mapping for Boot2docker.
Signed-off-by: Yongzhi Pan <panyongzhi@gmail.com>
Upstream-commit: 9dc2d0b8a35724946139f954f9575411b31695ea
Component: engine
2015-01-19 16:44:13 +08:00